Show More
| @@ -776,7 +776,7 b' class localrepository:' | |||
|
|
776 | 776 | |
|
|
777 | 777 | cmd = os.environ["HGMERGE"] |
|
|
778 | 778 | self.ui.debug("invoking merge with %s\n" % cmd) |
|
|
779 | r = os.system("%s %s %s %s" % (cmd, a, b, c)) | |
|
|
779 | r = os.system("%s %s %s %s %s" % (cmd, a, b, c, fn)) | |
|
|
780 | 780 | if r: |
|
|
781 | 781 | raise "Merge failed!" |
|
|
782 | 782 | |
General Comments 0
You need to be logged in to leave comments.
Login now