diff mercurial/commands.py @ 33865:af20468eb0a4

merge with stable
author Sean Farley <sean@farley.io>
date Mon, 21 Aug 2017 21:35:06 -0700
parents f6dc30b83432 cf0736696be0
children 800bb35d891e
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Aug 11 01:34:11 2017 -0700
+++ b/mercurial/commands.py	Mon Aug 21 21:35:06 2017 -0700
@@ -3335,7 +3335,9 @@
     revisions.
 
     See :hg:`help templates` for more about pre-packaged styles and
-    specifying custom templates.
+    specifying custom templates. The default template used by the log
+    command can be customized via the ``ui.logtemplate`` configuration
+    setting.
 
     Returns 0 on success.