diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:34:25 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:34:25 -0700 |
commit | 0bde8c0c1e53e2b2001f4ced58d3e66865758cea (patch) | |
tree | 2fe55b27c11430a6a89197748c71abde92c7bee5 /t | |
parent | 9c559d5b86389de2449cd3cd5d53afa14936a6df (diff) | |
parent | 117eea7eaaeb5ecb77d9b7cebdb40b4e85f37374 (diff) | |
download | git-0bde8c0c1e53e2b2001f4ced58d3e66865758cea.tar.gz |
Sync with Git 1.8.3.4
Diffstat (limited to 't')
-rwxr-xr-x | t/t6021-merge-criss-cross.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh index 331b9b07d4..d15b313d4b 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. |