From f3081dae014e08ece75cfb28a9844beb01b6d9f2 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sat, 17 Aug 2019 11:41:42 -0700 Subject: merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* I want to implement the same outward facing API as found within merge-recursive.h in a different merge strategy. However, that makes names like MERGE_RECURSIVE_{NORMAL,OURS,THEIRS} look a little funny; rename to MERGE_VARIANT_{NORMAL,OURS,THEIRS}. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- merge-recursive.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index 58a4c5238a..978847e672 100644 --- 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 */ -- cgit v1.2.1