Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/git-am.sh b/git-am.sh
index 6cf0eeee7159caecd5b76e0acb520af6895cef93..b5ed8ca15c9811ccd87b6d81a82ca301736f0b66 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -103,7 +103,8 @@ It does not apply to blobs recorded in its index."
 }
 
 prec=4
-dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= resolvemsg=
+dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary=
+resolvemsg= resume=
 git_apply_opt=
 
 while case "$#" in 0) break;; esac