| commit | 8a9d32b7e9f3aebd9c322c4613c4608224d09a60 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 4 May 2005 17:45:36 +0000 (4 10:45 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 4 May 2005 17:45:36 +0000 (4 10:45 -0700) | ||
| tree | d952b69c7ba71b0f5628166bfcc81abb67ed818f | treesnapshot (tar.gz zip) |
| parent | b46f0b6dfd09629645efc59cda76e7e4fad7ca39 | commitdiff |
When the patch tries to create a new file and the file exists, abort.
This fixes an error introduced to git-apply-patch-script in the previous
round. We do not invoke patch for create/delete case, so we need to
be a bit careful about detecting conflicts like this.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This fixes an error introduced to git-apply-patch-script in the previous
round. We do not invoke patch for create/delete case, so we need to
be a bit careful about detecting conflicts like this.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-apply-patch-script | diffblobblamehistory |