git-am: do not fail if 3-way fallback succeeds.
git-am: do not fail if 3-way fallback succeeds.

The current one incorrectly stops there without committing.

Signed-off-by: Junio C Hamano <dc50d1021234060e53ec42a77d526afa2fe07479@cox.net>

destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git