merge: add merge.renames config setting
authorBen Peart <Ben.Peart@microsoft.com>
Wed, 2 May 2018 16:01:14 +0000 (16:01 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:19:41 +0000 (16:19 +0900)
commit85b4603...5ce7ed399c83499851f46c4f870ce280
treed56e1f9...1c1ab077050a6332365868e39ce5a485copy hash to clipboard (tree)
parenta7152e9...226652e6ceaa64f099fc628aa2a909bdcopy hash to clipboard (diff)
Documentation/merge-config.txt
Documentation/merge-strategies.txt
diff.c
diff.h
merge-recursive.c
merge-recursive.h
t/t3034-merge-recursive-rename-options.sh