Show More
@@ -285,6 +285,9 b' def _ifail(repo, mynode, orig, fcd, fco,' | |||
|
285 | 285 | Rather than attempting to merge files that were modified on both |
|
286 | 286 | branches, it marks them as unresolved. The resolve command must be |
|
287 | 287 | used to resolve these conflicts.""" |
|
288 | # for change/delete conflicts write out the changed version, then fail | |
|
289 | if fcd.isabsent(): | |
|
290 | repo.wwrite(fcd.path(), fco.data(), fco.flags()) | |
|
288 | 291 | return 1, False |
|
289 | 292 | |
|
290 | 293 | def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None): |
General Comments 0
You need to be logged in to leave comments.
Login now