diff options
| author | Elijah Newren <newren@gmail.com> | 2019-08-17 11:41:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 10:08:04 -0700 |
| commit | f3081dae014e08ece75cfb28a9844beb01b6d9f2 (patch) | |
| tree | d5779b880c6506ec470a41eae65150ba59077797 /builtin/commit-graph.c | |
| parent | merge-recursive: split internal fields into a separate struct (diff) | |
| download | git-f3081dae014e08ece75cfb28a9844beb01b6d9f2.tar.gz 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 'builtin/commit-graph.c')
0 files changed, 0 insertions, 0 deletions