Show More
| @@ -220,6 +220,8 def filemerge(repo, mynode, orig, fcd, f | |||||
| 220 | util.copyfile(a, a + ".local") |
|
220 | util.copyfile(a, a + ".local") | |
| 221 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
|
221 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) | |
| 222 | repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
|
222 | repo.wwrite(fd + ".base", fca.data(), fca.flags()) | |
|
|
223 | os.unlink(b) | |||
|
|
224 | os.unlink(c) | |||
| 223 | return 1 # unresolved |
|
225 | return 1 # unresolved | |
| 224 | else: |
|
226 | else: | |
| 225 | args = _toolstr(ui, tool, "args", '$local $base $other') |
|
227 | args = _toolstr(ui, tool, "args", '$local $base $other') | |
General Comments 0
You need to be logged in to leave comments.
Login now