Mercurial > hg

diff doc/hgrc.5.txt @ 6075:63e0e57ab157

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add 'checkchanged' merge tool property
author Steve Borho <steve@borho.org>
date Wed, 06 Feb 2008 20:32:06 -0600
parents 83d193a513c8
children 50a277e6ceae
line wrap: on
line diff
--- a/doc/hgrc.5.txt	Mon Feb 11 16:13:43 2008 -0600
+++ b/doc/hgrc.5.txt	Wed Feb 06 20:32:06 2008 -0600
@@ -289,6 +289,10 @@
     Check whether there are conflicts even though the tool reported
     success.
     Default: False
+  checkchanged;;
+    Check whether outputs were written even though the tool reported
+    success.
+    Default: False
   fixeol;;
     Attempt to fix up EOL changes caused by the merge tool.
     Default: False