1275 |
1275 |
1276 def _workingpath(repo, ctx): |
1276 def _workingpath(repo, ctx): |
1277 return repo.wjoin(ctx.path()) |
1277 return repo.wjoin(ctx.path()) |
1278 |
1278 |
1279 |
1279 |
1280 def premerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): |
1280 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): |
1281 return _filemerge( |
1281 complete, merge_ret, deleted = _filemerge( |
1282 True, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels |
1282 True, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels |
1283 ) |
1283 ) |
1284 |
1284 if not complete: |
1285 |
1285 complete, merge_ret, deleted = _filemerge( |
1286 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): |
1286 False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels |
1287 return _filemerge( |
1287 ) |
1288 False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels |
1288 return complete, merge_ret, deleted |
1289 ) |
|
1290 |
1289 |
1291 |
1290 |
1292 def loadinternalmerge(ui, extname, registrarobj): |
1291 def loadinternalmerge(ui, extname, registrarobj): |
1293 """Load internal merge tool from specified registrarobj""" |
1292 """Load internal merge tool from specified registrarobj""" |
1294 for name, func in pycompat.iteritems(registrarobj._table): |
1293 for name, func in pycompat.iteritems(registrarobj._table): |