From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Dec 2016 08:11:41 +0000 (-0800)
Subject: Merge branch 'cp/merge-continue'
X-Git-Tag: v2.12.0-rc0~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05f6e1be8cdae1ebedf3cf7b7a072a3b35f945b5;p=git

Merge branch 'cp/merge-continue'

"git merge --continue" has been added as a synonym to "git commit"
to conclude a merge that has stopped due to conflicts.

* cp/merge-continue:
  merge: mark usage error strings for translation
  merge: ensure '--abort' option takes no arguments
  completion: add --continue option for merge
  merge: add '--continue' option as a synonym for 'git commit'
---

05f6e1be8cdae1ebedf3cf7b7a072a3b35f945b5