Andrew's git / gitweb.git / diff
?
merge: ensure '--abort' option takes no arguments
authorChris Packham <judge.packham@gmail.com>
Wed, 14 Dec 2016 08:37:57 +0000 (21:37 +1300)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2016 18:02:04 +0000 (10:02 -0800)
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>
No differences found