]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 022f25e) | patch
git-am: give better diagnostics when the patch does not apply during --3way
authorJunio C Hamano <junkio@cox.net>
Sat, 12 Aug 2006 23:16:47 +0000 (16:16 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 00:08:07 +0000 (17:08 -0700)
commitfd7bcfb524a3313ef5361bdd8493ba50635f50f0
tree1e8d0aff82644caa330a7a552777c7b61768d6eetree | snapshot
parent022f25e8d4bd3eaed6bb6d80a242f8930687d483commit | diff
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>
git-am.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.