The unified diff between revisions [8846a6b8..] and [ebdccab0..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'contrib/color-logs.conf'

#
#
# patch "contrib/color-logs.conf"
#  from [ffe3e7270a2952c508db2f2d9c3df82e05c859f4]
#    to [87e8ceac1e0a8d173e2a0da01e659d048824e9ed]
#
============================================================
--- contrib/color-logs.conf	ffe3e7270a2952c508db2f2d9c3df82e05c859f4
+++ contrib/color-logs.conf	87e8ceac1e0a8d173e2a0da01e659d048824e9ed
@@ -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 --diffs".
+# or "monotone diff", or best of all "monotone log --no-merges --diffs".
 #
 # use with the "colorize" script in this dir, or color-logs.sh
 #