equal
deleted
inserted
replaced
460 labels=None, localorother=None): |
460 labels=None, localorother=None): |
461 """ |
461 """ |
462 Generic driver for _imergelocal and _imergeother |
462 Generic driver for _imergelocal and _imergeother |
463 """ |
463 """ |
464 assert localorother is not None |
464 assert localorother is not None |
465 tool, toolpath, binary, symlink, scriptfn = toolconf |
|
466 r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, label=labels, |
465 r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, label=labels, |
467 localorother=localorother) |
466 localorother=localorother) |
468 return True, r |
467 return True, r |
469 |
468 |
470 @internaltool('merge-local', mergeonly, precheck=_mergecheck) |
469 @internaltool('merge-local', mergeonly, precheck=_mergecheck) |