Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Add tests for filesystem challenges (case and unicode normalization)
[gitweb.git]
/
t
/
t6021-merge-criss-cross.sh
diff --git
a/t/t6021-merge-criss-cross.sh
b/t/t6021-merge-criss-cross.sh
index 499cafb882b83b780171c8601b9f4c54b294ed43..0ab14a6e81302db6a1239d68270ab909cb2fd216 100755
(executable)
--- a/
t/t6021-merge-criss-cross.sh
+++ b/
t/t6021-merge-criss-cross.sh
@@
-20,7
+20,7
@@
test_expect_success 'prepare repository' \
7
8
9" > file &&
-git add file &&
+git add file &&
git commit -m "Initial commit" file &&
git branch A &&
git branch B &&