summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 18:34:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-22 18:34:25 (GMT)
commit0bde8c0c1e53e2b2001f4ced58d3e66865758cea (patch)
tree2fe55b27c11430a6a89197748c71abde92c7bee5 /t
parent9c559d5b86389de2449cd3cd5d53afa14936a6df (diff)
parent117eea7eaaeb5ecb77d9b7cebdb40b4e85f37374 (diff)
downloadgit-0bde8c0c1e53e2b2001f4ced58d3e66865758cea.zip
git-0bde8c0c1e53e2b2001f4ced58d3e66865758cea.tar.gz
git-0bde8c0c1e53e2b2001f4ced58d3e66865758cea.tar.bz2
Sync with Git 1.8.3.4
Diffstat (limited to 't')
-rwxr-xr-xt/t6021-merge-criss-cross.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 331b9b0..d15b313 100755
--- 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.