changeset 30497 | 002fa4d79466 |
parent 30494 | c1149533676b |
child 30506 | d9d8d78e6bc9 |
--- a/mercurial/cmdutil.py Mon Nov 21 21:32:55 2016 -0500 +++ b/mercurial/cmdutil.py Mon Nov 21 21:36:46 2016 -0500 @@ -3408,7 +3408,10 @@ return cmd -checkunresolved = mergeutil.checkunresolved +def checkunresolved(ms): + ms._repo.ui.deprecwarn('checkunresolved moved from cmdutil to mergeutil', + '4.1') + return mergeutil.checkunresolved(ms) # a list of (ui, repo, otherpeer, opts, missing) functions called by # commands.outgoing. "missing" is "missing" of the result of