diff -r dcfdf4d09663 -r da07367d683b mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Fri Aug 25 11:20:34 2017 -0700
+++ b/mercurial/cmdutil.py	Tue Aug 29 18:20:50 2017 -0700
@@ -123,6 +123,8 @@
      _('ignore changes in the amount of white space')),
     ('B', 'ignore-blank-lines', None,
      _('ignore changes whose lines are all blank')),
+    ('Z', 'ignore-space-at-eol', None,
+     _('ignore changes in whitespace at EOL')),
 ]
 
 diffopts2 = [