# 
# 
# patch "ChangeLog"
#  from [6f8867078134dd0cfa722236e4fc07e09f0639f5]
#    to [3b805963f360b4fd83beb3d8a2287ff385bff642]
# 
# patch "contrib/color-logs.conf"
#  from [87e8ceac1e0a8d173e2a0da01e659d048824e9ed]
#    to [ffe3e7270a2952c508db2f2d9c3df82e05c859f4]
# 
# patch "contrib/color-logs.sh"
#  from [4e04daeee4ee8ce8bf6ce45f074ba16faf50ccf9]
#    to [90a0de6aa87b7f4b39f7947fd1d359a3cc936385]
# 
# patch "contrib/monotone.el"
#  from [9e1a1ec218b98cd38c6126c48f00a1d585e65a13]
#    to [3dc1c23d499d1aa015ed7f145416a241a55f054f]
# 
============================================================
--- ChangeLog	6f8867078134dd0cfa722236e4fc07e09f0639f5
+++ ChangeLog	3b805963f360b4fd83beb3d8a2287ff385bff642
@@ -1,5 +1,7 @@
 2006-01-12  Matthew Gregan  <address@hidden>
 
+	* contrib/{color-logs.{conf,sh},monotone.el}: Changes to handle
+	renaming of --no-merges.
 	* app_state.{cc,hh}, commands.cc, monotone.cc, options.hh: Make
 	'log' default to not displaying merges.  Rename '--no-merges'
 	option to '--merges'.
============================================================
--- contrib/color-logs.conf	87e8ceac1e0a8d173e2a0da01e659d048824e9ed
+++ contrib/color-logs.conf	ffe3e7270a2952c508db2f2d9c3df82e05c859f4
@@ -1,6 +1,6 @@
 #
 # this is a colorization config for reading the output of "monotone log"
-# or "monotone diff", or best of all "monotone log --no-merges --diffs".
+# or "monotone diff", or best of all "monotone log --diffs".
 #
 # use with the "colorize" script in this dir, or color-logs.sh
 #
============================================================
--- contrib/color-logs.sh	4e04daeee4ee8ce8bf6ce45f074ba16faf50ccf9
+++ contrib/color-logs.sh	90a0de6aa87b7f4b39f7947fd1d359a3cc936385
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-./monotone log --diffs --no-merges $@    \
+./monotone log --diffs $@    \
   | ./contrib/colorize -c contrib/color-logs.conf  \
   | less -r -p -----------------------------------------------------------------
============================================================
--- contrib/monotone.el	9e1a1ec218b98cd38c6126c48f00a1d585e65a13
+++ contrib/monotone.el	3dc1c23d499d1aa015ed7f145416a241a55f054f
@@ -686,7 +686,7 @@
   (when (eq 'tree (monotone-arg-decode arg))
     (error "monotone subtree log is busted"))
   ;; 
-  (let ((cmds (list "log" "--no-merges"))
+  (let ((cmds (list "log"))
         (depth monotone-log-depth))
     (when (and (numberp depth) (< 0 depth))
       (setq cmds (append cmds (list (format "--last=%d" depth)))))