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.sh'

#
#
# patch "contrib/color-logs.sh"
#  from [90a0de6aa87b7f4b39f7947fd1d359a3cc936385]
#    to [4e04daeee4ee8ce8bf6ce45f074ba16faf50ccf9]
#
============================================================
--- contrib/color-logs.sh	90a0de6aa87b7f4b39f7947fd1d359a3cc936385
+++ contrib/color-logs.sh	4e04daeee4ee8ce8bf6ce45f074ba16faf50ccf9
@@ -1,5 +1,5 @@
 #!/bin/sh

-./monotone log --diffs $@    \
+./monotone log --diffs --no-merges $@    \
   | ./contrib/colorize -c contrib/color-logs.conf  \
   | less -r -p -----------------------------------------------------------------