Merge branch 'kb/am-deprecate-resolved'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Jul 2013 19:41:48 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Jul 2013 19:41:48 +0000 (12:41 -0700)
Promote "git am --continue" over "git am --resolved" for UI
consistency.

* kb/am-deprecate-resolved:
am: replace uses of --resolved with --continue

1  2 
Documentation/user-manual.txt
Simple merge