Show More
@@ -195,8 +195,8 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
195 | elif tool == 'internal:dump': |
|
195 | elif tool == 'internal:dump': | |
196 | a = repo.wjoin(fd) |
|
196 | a = repo.wjoin(fd) | |
197 | util.copyfile(a, a + ".local") |
|
197 | util.copyfile(a, a + ".local") | |
198 |
repo.wwrite( |
|
198 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) | |
199 |
repo.wwrite( |
|
199 | repo.wwrite(fd + ".base", fca.data(), fca.flags()) | |
200 | return 1 # unresolved |
|
200 | return 1 # unresolved | |
201 | else: |
|
201 | else: | |
202 | args = _toolstr(ui, tool, "args", '$local $base $other') |
|
202 | args = _toolstr(ui, tool, "args", '$local $base $other') |
General Comments 0
You need to be logged in to leave comments.
Login now