From e82d9c7bed90dd0144b2ed0bab3c67c420a771c5 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 12 Jan 2016 10:23:29 +0100 Subject: [PATCH] fixup! criss cross rename failure workaround This patch has been merged in a slightly different form, and the left-over patch is bogus (and has not been caught for a long time by this maintainer). Signed-off-by: Johannes Schindelin --- t/t4130-apply-criss-cross-rename.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh index bf7049e7d9..d173acde0f 100755 --- a/t/t4130-apply-criss-cross-rename.sh +++ b/t/t4130-apply-criss-cross-rename.sh @@ -14,8 +14,8 @@ create_file() { test_expect_success 'setup' ' create_file file1 "File1 contents" && - create_file file2 "File2 more contents" && - create_file file3 "File3 even more contents" && + create_file file2 "File2 contents" && + create_file file3 "File3 contents" && git add file1 file2 file3 && git commit -m 1 '