merge-recursive: check for file level conflicts then get new name
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:51:58 +0000 (10:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:02:53 +0000 (13:02 -0800)
commit79d49b7...8c75b80d5aeaf9d84895361b85e9c748
tree7a79a6c...2f0bc7d2662246e53c04d0b60fbb4861copy hash to clipboard (tree)
parentea625cb...274c6907fba02f7af3ab83458b331a1ecopy hash to clipboard (diff)
merge-recursive.c
strbuf.c
strbuf.h
t/t6043-merge-rename-directories.sh