equal
deleted
inserted
replaced
1262 if fo == b'l': |
1262 if fo == b'l': |
1263 s(_(b"the local file has been renamed to %s\n") % f1) |
1263 s(_(b"the local file has been renamed to %s\n") % f1) |
1264 else: |
1264 else: |
1265 s(_(b"the remote file has been renamed to %s\n") % f1) |
1265 s(_(b"the remote file has been renamed to %s\n") % f1) |
1266 s(_(b"resolve manually then use 'hg resolve --mark %s'\n") % f) |
1266 s(_(b"resolve manually then use 'hg resolve --mark %s'\n") % f) |
1267 ms.addpath(f, f1, fo) |
1267 ms.addpathconflict(f, f1, fo) |
1268 progress.increment(item=f) |
1268 progress.increment(item=f) |
1269 |
1269 |
1270 # When merging in-memory, we can't support worker processes, so set the |
1270 # When merging in-memory, we can't support worker processes, so set the |
1271 # per-item cost at 0 in that case. |
1271 # per-item cost at 0 in that case. |
1272 cost = 0 if wctx.isinmemory() else 0.001 |
1272 cost = 0 if wctx.isinmemory() else 0.001 |