Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
gitweb: Add author and contributor email to Atom feed
[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 e8606c751d6236ea7109359910a8e8adc01eb627..499cafb882b83b780171c8601b9f4c54b294ed43 100755
(executable)
--- a/
t/t6021-merge-criss-cross.sh
+++ b/
t/t6021-merge-criss-cross.sh
@@
-4,7
+4,7
@@
#
# See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
-# nice decription of what this is about.
+# nice de
s
cription of what this is about.
test_description='Test criss-cross merge'