diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-11-16 14:12:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-16 14:12:56 -0800 |
| commit | 92927ed0aac56a86f85049215791fcd106af4b62 (patch) | |
| tree | 7c9261390297ed1d52097d2dd2fc76b9a1b337b6 /Documentation/git-merge.txt | |
| parent | git-cvsexportcommit.perl: fix typos in output (diff) | |
| download | tgif-92927ed0aac56a86f85049215791fcd106af4b62.tar.xz | |
git-apply: fail if a patch cannot be applied.
Recently we fixed 'git-apply --stat' not to barf on a binary
differences. But it accidentally broke the error detection when
we actually attempt to apply them.
This commit fixes the problem and adds test cases.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions