Show More
@@ -468,7 +468,7 b' def _idump(repo, mynode, orig, fcd, fco,' | |||||
468 | a = _workingpath(repo, fcd) |
|
468 | a = _workingpath(repo, fcd) | |
469 | fd = fcd.path() |
|
469 | fd = fcd.path() | |
470 |
|
470 | |||
471 |
util. |
|
471 | util.writefile(a + ".local", fcd.decodeddata()) | |
472 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
|
472 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) | |
473 | repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
|
473 | repo.wwrite(fd + ".base", fca.data(), fca.flags()) | |
474 | return False, 1, False |
|
474 | return False, 1, False |
General Comments 0
You need to be logged in to leave comments.
Login now