Log ref changes made by git-merge and git-pull.

diff --git a/git-am.sh b/git-am.sh
index 679045a540c60e747074a9127bb7003f8a510b1c..db9a20a811199666fb64f34f1e54e0c841f494ee 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -77,7 +77,7 @@ fall_back_3way () {
     # This is not so wrong.  Depending on which base we picked,
     # orig_tree may be wildly different from ours, but his_tree
     # has the same set of wildly different changes in parts the
-    # patch did not touch, so resolve ends up cancelling them,
+    # patch did not touch, so resolve ends up canceling them,
     # saying that we reverted all those changes.
 
     git-merge-resolve $orig_tree -- HEAD $his_tree || {