diff -r e7222d326ea2 -r 07fc2f2134ba mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sun Nov 22 17:57:35 2015 -0800
+++ b/mercurial/filemerge.py	Sat Jan 02 03:02:57 2016 -0800
@@ -16,9 +16,9 @@
 from .node import nullid, short
 
 from . import (
-    cmdutil,
     error,
     match,
+    scmutil,
     simplemerge,
     tagmerge,
     templatekw,
@@ -608,7 +608,7 @@
     b = temp("base", fca)
     c = temp("other", fco)
     if not fcd.isabsent():
-        back = cmdutil.origpath(ui, repo, a)
+        back = scmutil.origpath(ui, repo, a)
         if premerge:
             util.copyfile(a, back)
     else: