193 if tool == "internal:merge": |
193 if tool == "internal:merge": |
194 r = simplemerge.simplemerge(ui, a, b, c, label=['local', 'other']) |
194 r = simplemerge.simplemerge(ui, a, b, c, label=['local', 'other']) |
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(a + ".other", fco.data(), fco.flags()) |
198 repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
199 repo.wwrite(a + ".base", fca.data(), fca.flags()) |
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') |
203 if "$output" in args: |
203 if "$output" in args: |
204 out, a = a, back # read input from backup, write to original |
204 out, a = a, back # read input from backup, write to original |