Junio C Hamano 8a9d32b7e9 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>

2005-05-04 10:45:36 -07:00

1.8 KiB

Executable File

Raw Blame History

View Raw