Show More
@@ -1498,8 +1498,8 b' class localrepository:' | |||
|
1498 | 1498 | self.ui.debug("file %s: other %s ancestor %s\n" % |
|
1499 | 1499 | (fn, short(other), short(base))) |
|
1500 | 1500 | |
|
1501 |
cmd = os.environ.get("HGMERGE" |
|
|
1502 |
|
|
|
1501 | cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") | |
|
1502 | or "hgmerge") | |
|
1503 | 1503 | r = os.system("%s %s %s %s" % (cmd, a, b, c)) |
|
1504 | 1504 | if r: |
|
1505 | 1505 | self.ui.warn("merging %s failed!\n" % fn) |
General Comments 0
You need to be logged in to leave comments.
Login now