git-am: propagate --3way options as well
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Dec 2008 23:38:27 +0000 (15:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2008 02:45:02 +0000 (18:45 -0800)
The reasoning is the same as the previous patch, where we made -C<n>
and -p<n> propagate across a failure.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found