Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-am: give better diagnostics when the patch does not apply during --3way
author
Junio C Hamano
<junkio@cox.net>
Sat, 12 Aug 2006 23:16:47 +0000
(16:16 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Sun, 13 Aug 2006 00:08:07 +0000
(17:08 -0700)
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>
raw
|
patch
| inline |
side by side
(from:
fd7bcfb
)
No differences found