# 
# 
# patch "monotone.texi"
#  from [ee87f4b230d750666be890329395a540a1d3a2e2]
#    to [cbc87b47e45384cb320b2b59c4ebdf0ae82f2867]
# 
============================================================
--- monotone.texi	ee87f4b230d750666be890329395a540a1d3a2e2
+++ monotone.texi	cbc87b47e45384cb320b2b59c4ebdf0ae82f2867
@@ -4136,17 +4136,23 @@
 to files changed within the current subdirectory of the working copy.
 
 @item monotone log
address@hidden monotone log address@hidden address@hidden [...]] [--brief] address@hidden [...]]
address@hidden monotone log address@hidden address@hidden [...]] [--brief] [--merges] address@hidden [...]]
 
 This command prints out a log, in reverse-ancestry order, of small
 history summaries.  Each summary contains author, date, changelog and
-comment information associated with a revision.  If @code{--brief} is
-given, the output consists of one line per revision with the revision
-ID, the author, the date and the branches (separated with commas).
+comment information associated with a revision.  
 
+If @code{--brief} is given, the output consists of one line per revision
+with the revision ID, the author, the date and the branches (separated
+with commas).
+
 If @address@hidden is given, at most that many log entries will be
 given.
 
+By default, the log entries for merge nodes are not shown; usually they
+don't contain much interesting information. If @code{--merges} is given,
+the log entries for these nodes will be included.
+
 If one or more revision IDs are given, the command starts tracing back
 through history from these revisions, otherwise it starts from the base
 revision of your working copy.