diff mercurial/help/config.txt @ 22607:4a00110fd870

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 01 Oct 2014 15:05:09 -0500
parents 6e5657ce9e8c 551d776a0a9a
children 2b3189ec3d14
line wrap: on
line diff
--- a/mercurial/help/config.txt	Wed Oct 01 14:44:24 2014 -0500
+++ b/mercurial/help/config.txt	Wed Oct 01 15:05:09 2014 -0500
@@ -531,6 +531,9 @@
 ``git``
     Use git extended diff format.
 
+``nobinary``
+    Omit git binary patches.
+
 ``nodates``
     Don't include dates in diff headers.