mercurial/commands.py
changeset 43873 8caec25f5d8f
parent 43861 aac921f54554
child 43875 8376d5d62d36
--- a/mercurial/commands.py	Thu Dec 12 09:59:03 2019 -0800
+++ b/mercurial/commands.py	Wed Dec 11 19:42:05 2019 -0800
@@ -4888,6 +4888,13 @@
         node = scmutil.revsingle(repo, node).node()
 
     if not node and not abort:
+        if ui.configbool(b'commands', b'merge.require-rev'):
+            raise error.Abort(
+                _(
+                    b'configuration requires specifying revision to merge '
+                    b'with'
+                )
+            )
         node = repo[destutil.destmerge(repo)].node()
 
     if opts.get(b'preview'):