]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5bf7e57) | patch
merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
authorElijah Newren <newren@gmail.com>
Sat, 17 Aug 2019 18:41:42 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Aug 2019 17:08:04 +0000 (10:08 -0700)
commitf3081dae014e08ece75cfb28a9844beb01b6d9f2
treed5779b880c6506ec470a41eae65150ba59077797tree | snapshot
parent5bf7e5779ec6d5293b3135554d49e6fcee88d399commit | 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>
merge-recursive.c diff | blob | history
merge-recursive.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.