changeset 1907 | 7718885070b1 |
parent 1788 | 750b9cd83965 |
child 1914 | a5bf0030df5f |
--- a/doc/hgrc.5.txt Mon Feb 27 12:50:49 2006 -0800 +++ b/doc/hgrc.5.txt Mon Feb 27 13:18:57 2006 -0800 @@ -238,6 +238,10 @@ The editor to use during a commit. Default is $EDITOR or "vi". interactive;; Allow to prompt the user. True or False. Default is True. + logtemplate;; + Template string for commands that print changesets. + logmap;; + Template map file for commands that print changesets. merge;; The conflict resolution program to use during a manual merge. Default is "hgmerge".