| commit | 79d49b7d8c75b80d5aeaf9d84895361b85e9c748 | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 14 Feb 2018 18:51:58 +0000 (14 10:51 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Feb 2018 21:02:53 +0000 (14 13:02 -0800) | ||
| tree | 7a79a6c42f0bc7d2662246e53c04d0b60fbb4861 | treesnapshot (tar.gz zip) |
| parent | ea625cb0274c6907fba02f7af3ab83458b331a1e | commitdiff |
merge-recursive: check for file level conflicts then get new name
Before trying to apply directory renames to paths within the given
directories, we want to make sure that there aren't conflicts at the
file level either. If there aren't any, then get the new name from
any directory renames.
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
file level either. If there aren't any, then get the new name from
any directory renames.
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 | |
| strbuf.c | diffblobblamehistory | |
| strbuf.h | diffblobblamehistory | |
| t/t6043-merge-rename-directories.sh | diffblobblamehistory |