423 if not lfutil.isstandin(orig): |
423 if not lfutil.isstandin(orig): |
424 return origfn(repo, mynode, orig, fcdest, fcother, fcancestor) |
424 return origfn(repo, mynode, orig, fcdest, fcother, fcancestor) |
425 else: |
425 else: |
426 if not fcother.cmp(fcdest): # files identical? |
426 if not fcother.cmp(fcdest): # files identical? |
427 return None |
427 return None |
428 |
|
429 if orig != fcother.path(): |
|
430 repo.ui.status(_('merging %s and %s to %s\n') |
|
431 % (lfutil.splitstandin(orig), |
|
432 lfutil.splitstandin(fcother.path()), |
|
433 lfutil.splitstandin(fcdest.path()))) |
|
434 else: |
|
435 repo.ui.status(_('merging %s\n') |
|
436 % lfutil.splitstandin(fcdest.path())) |
|
437 |
428 |
438 if repo.ui.promptchoice(_('largefile %s has a merge conflict\n' |
429 if repo.ui.promptchoice(_('largefile %s has a merge conflict\n' |
439 'keep (l)ocal or take (o)ther?' |
430 'keep (l)ocal or take (o)ther?' |
440 '$$ &Local $$ &Other') % |
431 '$$ &Local $$ &Other') % |
441 lfutil.splitstandin(orig), 0) == 0: |
432 lfutil.splitstandin(orig), 0) == 0: |