Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
blame: correctly handle files regardless of autocrlf
[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 331b9b07d4eedb07377de605ebb87691427b7bb4..d15b313d4b5e65bc583b7c1f0e4efbb5ac56cb00 100755
(executable)
--- a/
t/t6021-merge-criss-cross.sh
+++ b/
t/t6021-merge-criss-cross.sh
@@
-3,7
+3,7
@@
# Copyright (c) 2005 Fredrik Kuivinen
#
-# See http://marc.
theaimsgroup.com
/?l=git&m=111463358500362&w=2 for a
+# See http://marc.
info
/?l=git&m=111463358500362&w=2 for a
# nice description of what this is about.