Mercurial > hg
diff hgext/largefiles/uisetup.py @ 26605:ef21a2c41629
filemerge: add a wrapper around the filemerge function
We'll introduce a separate premerge function that calls the same code.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sun, 11 Oct 2015 12:31:08 -0700 |
parents | 9a466b9f9792 |
children | 42910f9fffeb |
line wrap: on
line diff
--- a/hgext/largefiles/uisetup.py Fri Oct 09 01:19:37 2015 +0200 +++ b/hgext/largefiles/uisetup.py Sun Oct 11 12:31:08 2015 -0700 @@ -102,7 +102,7 @@ overrides.mergerecordupdates) entry = extensions.wrapfunction(merge, 'update', overrides.mergeupdate) - entry = extensions.wrapfunction(filemerge, 'filemerge', + entry = extensions.wrapfunction(filemerge, '_filemerge', overrides.overridefilemerge) entry = extensions.wrapfunction(cmdutil, 'copy', overrides.overridecopy)