Mercurial > hg

diff mercurial/help/config.txt @ 26937:dda0aa3baedd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: add origbackuppath helper
author Christian Delahousse <cdelahousse@fb.com>
date Thu, 12 Nov 2015 16:56:06 -0600
parents dfab6edb98e3
children 41d3e307a7c1
line wrap: on
line diff
--- a/mercurial/help/config.txt	Tue Nov 10 11:16:25 2015 -0800
+++ b/mercurial/help/config.txt	Thu Nov 12 16:56:06 2015 -0600
@@ -1496,6 +1496,10 @@
     markers is different from the encoding of the merged files,
     serious problems may occur.
 
+``origbackuppath``
+    The path to a directory used to store generated .orig files. If the path is
+    not a directory, one will be created.
+
 ``patch``
     An optional external tool that ``hg import`` and some extensions
     will use for applying patches. By default Mercurial uses an