aboutsummaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2006-07-10 01:50:18 -0400
committerJunio C Hamano <junkio@cox.net>2006-07-10 00:36:44 -0700
commit82e5a82fd73edb80a841f5fab1660e14b9b8f3ad (patch)
tree9661cdf47ee3bf69192ff336e0514fc6dd607728 /t/t6021-merge-criss-cross.sh
parent930cf7dd7cc6b87d173f182230763e1f1913d319 (diff)
downloadgit-82e5a82fd73edb80a841f5fab1660e14b9b8f3ad.tar.gz
git-82e5a82fd73edb80a841f5fab1660e14b9b8f3ad.tar.xz
Fix more typos, primarily in the code
The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
-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 262381379..8f7366da8 100755
--- 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 description of what this is about.
test_description='Test criss-cross merge'