global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-04 06:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'criss-cross-merge' into HEAD

Browse Source
This commit is contained in:
Johannes Schindelin
2016-01-05 14:45:53 +01:00
parent a969009781 2012776a73
commit 9dfbf9d1df
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t4130-apply-criss-cross-rename.sh
View File

@@ -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
'