Show More
@@ -1287,8 +1287,8 b' class localrepository:' | |||
|
1287 | 1287 | c = temp("other", other) |
|
1288 | 1288 | |
|
1289 | 1289 | self.ui.note("resolving %s\n" % fn) |
|
1290 | self.ui.debug("file %s: other %s ancestor %s\n" % | |
|
1291 | (fn, short(other), short(base))) | |
|
1290 | self.ui.debug("file %s: my %s other %s ancestor %s\n" % | |
|
1291 | (fn, short(my), short(other), short(base))) | |
|
1292 | 1292 | |
|
1293 | 1293 | cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") |
|
1294 | 1294 | or "hgmerge") |
General Comments 0
You need to be logged in to leave comments.
Login now