##// END OF EJS Templates
filemerge.filemerge: make a tuple containing merge paths on disk...
Siddharth Agarwal -
r26527:b4aab422 default
parent child Browse files
Show More
@@ -498,6 +498,7 b' def filemerge(repo, mynode, orig, fcd, f'
498 498 c = temp("other", fco)
499 499 back = a + ".orig"
500 500 util.copyfile(a, back)
501 files = (a, b, c, back)
501 502
502 503 if orig != fco.path():
503 504 ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
@@ -520,7 +521,7 b' def filemerge(repo, mynode, orig, fcd, f'
520 521 labels = _formatlabels(repo, fcd, fco, fca, labels)
521 522
522 523 needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf,
523 (a, b, c, back), labels=labels)
524 files, labels=labels)
524 525
525 526 if not needcheck:
526 527 if r:
General Comments 0
You need to be logged in to leave comments. Login now