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: NChris Packham <judge.packham@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>