| commit | 6f50833e98d9d88e331a0d5022130dd3d49cf876 | |
| author | Jeff King <peff@peff.net> | |
| Mon, 26 Oct 2015 21:36:18 +0000 (26 17:36 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Oct 2015 21:48:54 +0000 (26 14:48 -0700) | ||
| tree | f4b7b4478073170c2846a8129baafe91b6363e39 | treesnapshot (tar.gz zip) |
| parent | 441c4a40173fe1ee8a5c0094e587dfc47e2a6460 | commitdiff |
t6031: move triple-rename test to t3030
The t6031 test was introduced to check filemode handling of
merge-recursive. Much later, an unrelated test was tacked on
to look at renames and d/f conflicts. This test does not
depend on anything that happened before (it actually blows
away any existing content in the test repo). Let's move it
to t3030, where there are more related tests.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The t6031 test was introduced to check filemode handling of
merge-recursive. Much later, an unrelated test was tacked on
to look at renames and d/f conflicts. This test does not
depend on anything that happened before (it actually blows
away any existing content in the test repo). Let's move it
to t3030, where there are more related tests.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3030-merge-recursive.sh | diffblobblamehistory | |
| t/t6031-merge-recursive.sh | diffblobblamehistory |