--- a/mercurial/commands.py	Thu Nov 12 17:00:08 2015 -0600
+++ b/mercurial/commands.py	Tue Nov 10 14:26:19 2015 -0800
@@ -5678,7 +5678,7 @@
                 # for files in tocomplete, ms.resolve will not overwrite
                 # .orig -- only preresolve does
                 try:
-                    util.rename(a + ".resolve", a + ".orig")
+                    util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
                 except OSError as inst:
                     if inst.errno != errno.ENOENT:
                         raise