apply.c
15.3 KB
-
apply: convert checkout conflicts to apply failures · dddfff77
When there's a checkout conflict during apply, that means that the working directory was modified in a conflicting manner and the postimage cannot be written. During application, convert this to an application failure for consistency across workdir/index/both applications.
Edward Thomson committed