From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 4 Dec 2008 23:38:27 +0000 (-0800)
Subject: git-am: propagate --3way options as well
X-Git-Tag: v1.6.1-rc2~5^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/22db240dd1791b32e7f6d25a466c2835bdccb51e?hp=22db240dd1791b32e7f6d25a466c2835bdccb51e

git-am: propagate --3way options as well

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>
---