X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-resolve.sh;h=75e1de49ac9adb443e6065c93ac691c27f0f5518;hb=885b98107547fe3f6d17ca0af0578e040f7600d0;hp=0a8ef216cb8a45df7f900a0c9698bec3e4bb47bb;hpb=a549e11cc2fee10ddf66dd98ea79f7c624eee34e;p=git.git

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 0a8ef216c..75e1de49a 100755
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2005 Junio C Hamano
 #
-# Resolve two trees, using enhancd multi-base read-tree.
+# Resolve two trees, using enhanced multi-base read-tree.
 
 # The first parameters up to -- are merge bases; the rest are heads.
 bases= head= remotes= sep_seen=