--- a/mercurial/commands.py	Sun Mar 16 17:31:31 2014 +0200
+++ b/mercurial/commands.py	Sat Aug 23 23:03:50 2014 +0900
@@ -3880,6 +3880,8 @@
         raise util.Abort(_('similarity must be between 0 and 100'))
     if sim and not update:
         raise util.Abort(_('cannot use --similarity with --bypass'))
+    if opts.get('exact') and opts.get('edit'):
+        raise util.Abort(_('cannot use --exact with --edit'))
 
     if update:
         cmdutil.checkunfinished(repo)