diff options
| author | Elijah Newren <newren@gmail.com> | 2018-04-19 19:58:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 09:11:00 +0200 |
| commit | f6f775591881036a3c4bfcf6737c9119c251537d (patch) | |
| tree | 769a7e72d7ccd4107fe64e512a3448393cd7e9de /t/t6043-merge-rename-directories.sh | |
| parent | merge-recursive: add computation of collisions due to dir rename & merging (diff) | |
| download | git-f6f775591881036a3c4bfcf6737c9119c251537d.tar.xz git-f6f775591881036a3c4bfcf6737c9119c251537d.zip | |
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>
Diffstat (limited to '')
| -rwxr-xr-x | t/t6043-merge-rename-directories.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh index 8ea9ec49bc..b24562b849 100755 --- a/t/t6043-merge-rename-directories.sh +++ b/t/t6043-merge-rename-directories.sh @@ -489,7 +489,7 @@ test_expect_success '2a-setup: Directory split into two on one side, with equal ) ' -test_expect_failure '2a-check: Directory split into two on one side, with equal numbers of paths' ' +test_expect_success '2a-check: Directory split into two on one side, with equal numbers of paths' ' ( cd 2a && |