merge-recursive: check for file level conflicts then get new name
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:08 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commitf6f7755...1881036a3c4bfcf6737c9119c251537d
tree769a7e7...d7ccd4107fe64e512a3448393cd7e9decopy hash to clipboard (tree)
parente95ab70...ac4f38f1d365cdc03a7a041920c9c27bcopy hash to clipboard (diff)
merge-recursive.c
strbuf.c
strbuf.h
t/t6043-merge-rename-directories.sh