Teach 'diff' about 'diff' attribute.

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 0a8ef216cb8a45df7f900a0c9698bec3e4bb47bb..75e1de49ac9adb443e6065c93ac691c27f0f5518 100755 (executable)
--- 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=