Elijah Newren f3081dae01 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>

2019-08-19 10:08:04 -07:00

3.7 KiB

Raw Blame History

View Raw