Eleventh batch

[thirdparty/git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index 58a4c5238a6032970d381d1d0ada57a7e5d1ba45..978847e6724805ccab3fb85015f51677b045da62 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -32,9 +32,9 @@ struct merge_options {
        /* xdiff-related options (patience, ignore whitespace, ours/theirs) */
        long xdl_opts;
        enum {
-               MERGE_RECURSIVE_NORMAL = 0,
-               MERGE_RECURSIVE_OURS,
-               MERGE_RECURSIVE_THEIRS
+               MERGE_VARIANT_NORMAL = 0,
+               MERGE_VARIANT_OURS,
+               MERGE_VARIANT_THEIRS
        } recursive_variant;
 
        /* console output related options */