From: Chris Packham <judge.packham@gmail.com>
Date: Wed, 14 Dec 2016 08:37:57 +0000 (+1300)
Subject: merge: ensure '--abort' option takes no arguments
X-Git-Tag: v2.12.0-rc0~105^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/042e290da6aee0a9f21cd5890ccf231c266e177e?hp=042e290da6aee0a9f21cd5890ccf231c266e177e

merge: ensure '--abort' option takes no arguments

Like '--continue', the '--abort' option doesn't make any sense with
other options or arguments to 'git merge' so ensure that none are
present.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---