Mercurial > hg
diff hgext/largefiles/overrides.py @ 48432:f45a4a47f6a8
filemerge: inline `_filemerge()` into `filemerge()`
The caller is now trivial, so the indirection is pointless.
Differential Revision: https://phab.mercurial-scm.org/D11860
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 03 Dec 2021 22:45:35 -0800 |
| parents | 6b1049d71c3e |
| children | 608a35db186c |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Fri Dec 03 21:41:43 2021 -0800 +++ b/hgext/largefiles/overrides.py Fri Dec 03 22:45:35 2021 -0800 @@ -666,7 +666,7 @@ # Override filemerge to prompt the user about how they wish to merge # largefiles. This will handle identical edits without prompting the user. -@eh.wrapfunction(filemerge, b'_filemerge') +@eh.wrapfunction(filemerge, b'filemerge') def overridefilemerge( origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None ):