diff options
| author | Elijah Newren <newren@gmail.com> | 2019-08-17 20:41:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 19:08:04 +0200 |
| commit | f3081dae014e08ece75cfb28a9844beb01b6d9f2 (patch) | |
| tree | d5779b880c6506ec470a41eae65150ba59077797 /merge-recursive.h | |
| parent | merge-recursive: split internal fields into a separate struct (diff) | |
| download | git-f3081dae014e08ece75cfb28a9844beb01b6d9f2.tar.xz git-f3081dae014e08ece75cfb28a9844beb01b6d9f2.zip | |
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 */ |