Junio C Hamano fd7bcfb524 git-am: give better diagnostics when the patch does not apply during --3way ...

If the user tries to apply a patch that was hand-edited in such
a way that it does not apply to the original file recorded on
its "index" line anymore, we did detect the situation but did
not issue an error message that is specific enough.

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

2006-08-12 17:08:07 -07:00

10 KiB

Executable File

Raw Blame History

View Raw