X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-applypatch.sh;h=8df2aee4c2d031ac10c66af0a079bd022c281c0d;hb=566842f62bdf1f16c2e94fb431445d2e6c0f3f0b;hp=e4b09472e1fa27a6431b431572af7353c4f0a9b2;hpb=67644a4d77f55cd1c960d046079d26719f1e7cd6;p=git.git

diff --git a/git-applypatch.sh b/git-applypatch.sh
index e4b09472e..8df2aee4c 100755
--- a/git-applypatch.sh
+++ b/git-applypatch.sh
@@ -182,7 +182,7 @@ git-apply --index "$PATCHFILE" || {
 	# 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.
 
 	if git-merge-resolve $orig_tree -- HEAD $his_tree