diff -r 4f37af86d5d5 -r b14fdf1fb615 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Thu Oct 18 10:11:08 2018 -0700
+++ b/mercurial/cmdutil.py	Thu Feb 09 09:17:40 2017 -0800
@@ -365,8 +365,8 @@
             if backups:
                 # Equivalent to hg.revert
                 m = scmutil.matchfiles(repo, backups.keys())
-                mergemod.update(repo, repo.dirstate.p1(),
-                        False, True, matcher=m)
+                mergemod.update(repo, repo.dirstate.p1(), branchmerge=False,
+                                force=True, matcher=m)
 
             # 3b. (apply)
             if dopatch: