diff -r ffd08ec22955 -r 0d0f8bd692c4 mercurial/commands.py
--- a/mercurial/commands.py	Wed Jul 11 21:15:52 2018 +0900
+++ b/mercurial/commands.py	Wed Jul 11 21:23:18 2018 +0900
@@ -2533,6 +2533,9 @@
     """
     opts = pycompat.byteskwargs(opts)
     diff = opts.get('all') or opts.get('diff')
+    if diff and opts.get('all_files'):
+        raise error.Abort(_('--diff and --all-files are mutually exclusive'))
+
     reflags = re.M
     if opts.get('ignore_case'):
         reflags |= re.I