Merge 'criss-cross-merge' into HEAD

kasal · kasal · commit fb0f5d14bc92 · 2014-05-29T11:09:12.000+02:00
diff --git 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 contents" &&
-	create_file file3 "File3 contents" &&
+	create_file file2 "File2 more contents" &&
+	create_file file3 "File3 even more contents" &&
 	git add file1 file2 file3 &&
 	git commit -m 1
 '
