vpatch: discard 'ignored' for 'oldtype'.

[wiggle.git] / wiggle.h

diff --git a/wiggle.h b/wiggle.h
index 2bf072f8d8fcc21c321f2245caa9266bef50c632..1a7afb9157f2278ee122d14cc5c3edb8c33b1be9 100644 (file)
--- a/wiggle.h
+++ b/wiggle.h
@@ -107,12 +107,11 @@ struct merge {
        enum mergetype {
                End, Unmatched, Unchanged, Extraneous,
                Changed, Conflict, AlreadyApplied,
-       } type;
+       } type, oldtype;
        int a, b, c; /* start of ranges */
        int al, bl, cl; /* length of ranges */
        int c1, c2; /* this or next common-sequence */
        int in_conflict;
-       int ignored;
        int lo, hi; /* region of a Changed or Unchanged that is not involved
                    * in a conflict.
                    * These are distances from start of the "before" section,