tree 1312b104cc48f5c06c74fbf5d03ffa95e5a3f618
parent 1d73f8e86d7b4d95e0b7ce53eec2a5f8114722ac
parent c7d227df5bf7fe9d5df98a55cd637bfaf38685ea
author Junio C Hamano <gitster@pobox.com> 1482826301 -0800
committer Junio C Hamano <gitster@pobox.com> 1482826301 -0800

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'