--- a/mercurial/dispatch.py	Sat Aug 20 23:05:18 2016 +0200
+++ b/mercurial/dispatch.py	Thu Aug 18 11:32:02 2016 -0400
@@ -556,7 +556,7 @@
         c.append((o[0], o[1], options[o[1]], o[3]))
 
     try:
-        args = fancyopts.fancyopts(args, c, cmdoptions, True)
+        args = fancyopts.fancyopts(args, c, cmdoptions, gnu=True)
     except fancyopts.getopt.GetoptError as inst:
         raise error.CommandError(cmd, inst)