diff options
| author | Elijah Newren <newren@gmail.com> | 2019-08-17 21:41:42 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 20:08:04 +0300 |
| commit | f3081dae014e08ece75cfb28a9844beb01b6d9f2 (patch) | |
| tree | d5779b880c6506ec470a41eae65150ba59077797 /config.mak.uname | |
| parent | 5bf7e5779ec6d5293b3135554d49e6fcee88d399 (diff) | |
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 'config.mak.uname')
0 files changed, 0 insertions, 0 deletions