| commit | 53e32d4652a5cb073c8add8e7867fd7e76c2deff | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 14 Feb 2018 18:51:56 +0000 (14 10:51 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Feb 2018 21:02:52 +0000 (14 13:02 -0800) | ||
| tree | 1f4945826bc55dc854be5e3e7cb10c695aef374b | treesnapshot (tar.gz zip) |
| parent | 8383408dc79300211778b615b353b3463ccc369a | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory |