diff options
| author | Elijah Newren <newren@gmail.com> | 2019-04-05 08:00:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-08 16:02:07 +0900 |
| commit | e0612a192a82280132ce2d3893c610b3db54c8ee (patch) | |
| tree | 3a74045a22682384379c1e4a8e499a5c4bc0b66c | |
| parent | merge-recursive: switch from (oid,mode) pairs to a diff_filespec (diff) | |
| download | git-e0612a192a82280132ce2d3893c610b3db54c8ee.tar.gz git-e0612a192a82280132ce2d3893c610b3db54c8ee.zip | |
t6043: fix copied test description to match its purpose
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t6043-merge-rename-directories.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh index 62c564707b..fe205be607 100755 --- a/t/t6043-merge-rename-directories.sh +++ b/t/t6043-merge-rename-directories.sh @@ -3910,7 +3910,7 @@ test_expect_success '12a-check: Moving one directory hierarchy into another' ' # To which, I can do no more than shrug my shoulders and say that # even simple rules give weird results when given weird inputs. -test_expect_success '12b-setup: Moving one directory hierarchy into another' ' +test_expect_success '12b-setup: Moving two directory hierarchies into each other' ' test_create_repo 12b && ( cd 12b && @@ -3940,7 +3940,7 @@ test_expect_success '12b-setup: Moving one directory hierarchy into another' ' ) ' -test_expect_success '12b-check: Moving one directory hierarchy into another' ' +test_expect_success '12b-check: Moving two directory hierarchies into each other' ' ( cd 12b && |