summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-02-14 18:51:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-14 21:02:52 (GMT)
commit53e32d4652a5cb073c8add8e7867fd7e76c2deff (patch)
tree1f4945826bc55dc854be5e3e7cb10c695aef374b /merge-recursive.h
parent8383408dc79300211778b615b353b3463ccc369a (diff)
downloadgit-53e32d4652a5cb073c8add8e7867fd7e76c2deff.zip
git-53e32d4652a5cb073c8add8e7867fd7e76c2deff.tar.gz
git-53e32d4652a5cb073c8add8e7867fd7e76c2deff.tar.bz2
merge-recursive: check for directory level conflicts
Before trying to apply directory renames to paths within the given directories, we want to make sure that there aren't conflicts at the directory level. There will be additional checks at the individual file level too, which will be added later. Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions