diff -r e7222d326ea2 -r 07fc2f2134ba mercurial/commands.py
--- a/mercurial/commands.py	Sun Nov 22 17:57:35 2015 -0800
+++ b/mercurial/commands.py	Sat Jan 02 03:02:57 2016 -0800
@@ -5953,7 +5953,7 @@
                 if complete:
                     try:
                         util.rename(a + ".resolve",
-                                    cmdutil.origpath(ui, repo, a))
+                                    scmutil.origpath(ui, repo, a))
                     except OSError as inst:
                         if inst.errno != errno.ENOENT:
                             raise
@@ -5973,7 +5973,7 @@
             # replace filemerge's .orig file with our resolve file
             a = repo.wjoin(f)
             try:
-                util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
+                util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
             except OSError as inst:
                 if inst.errno != errno.ENOENT:
                     raise