largefiles: don't try to explain rename history before prompt for conflicts

Before it tried to explain the exact situation when merging moved largefiles.
That do not happen for normal merges and is not more relevant for largefiles
than for normal files. It is unneeded complexity - remove it.

hgext/largefiles/overrides.py

@@ -426,15 +426,6 b' def overridefilemerge(origfn, repo, myno'
         if not fcother.cmp(fcdest): # files identical?
             return None
 
-        if orig != fcother.path():
-            repo.ui.status(_('merging %s and %s to %s\n')
-                           % (lfutil.splitstandin(orig),
-                              lfutil.splitstandin(fcother.path()),
-                              lfutil.splitstandin(fcdest.path())))
-        else:
-            repo.ui.status(_('merging %s\n')
-                           % lfutil.splitstandin(fcdest.path()))
-
         if repo.ui.promptchoice(_('largefile %s has a merge conflict\n'
                                   'keep (l)ocal or take (o)ther?'
                                   '$$ &Local $$ &Other') %

tests/test-largefiles.t

@@ -1374,7 +1374,6 b' correctly.'
   (run 'hg heads' to see heads, 'hg merge' to merge)
   2 largefiles cached
   $ hg merge
-  merging sub/large4
   largefile sub/large4 has a merge conflict
   keep (l)ocal or take (o)ther? l
   3 files updated, 1 files merged, 0 files removed, 0 files unresolved