summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2020-12-21 18:19:36 +0300
committerJunio C Hamano <gitster@pobox.com>2020-12-21 13:47:31 -0800
commit4f54544d736e286538ebef0d3120c164f80f04c1 (patch)
treebb6b462b9853ce9fbd971d9365c44f1972062f04 /builtin/merge.c
parent7acf0d06f54043b3b79d5d388ed1c8fb66e2db5a (diff)
diff-merges: rename diff_merges_default_to_enable() to match semantics
Rename diff_merges_default_to_enable() to diff_merges_default_to_first_parent() to match its semantics. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions