Martin von Zweigbergk c5e610be50 git-rebase--am: remove unnecessary --3way option ...

Since 22db240 (git-am: propagate --3way options as well, 2008-12-04),
the --3way has been propageted across failure, so it is since
pointless to pass it to git-am when resuming.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2011-02-10 14:08:10 -08:00

615 B

Raw Blame History

View Raw