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/monotone.el'

#
#
# patch "contrib/monotone.el"
#  from [3dc1c23d499d1aa015ed7f145416a241a55f054f]
#    to [9e1a1ec218b98cd38c6126c48f00a1d585e65a13]
#
============================================================
--- contrib/monotone.el	3dc1c23d499d1aa015ed7f145416a241a55f054f
+++ contrib/monotone.el	9e1a1ec218b98cd38c6126c48f00a1d585e65a13
@@ -686,7 +686,7 @@ the buffer if not global."
   (when (eq 'tree (monotone-arg-decode arg))
     (error "monotone subtree log is busted"))
   ;;
-  (let ((cmds (list "log"))
+  (let ((cmds (list "log" "--no-merges"))
         (depth monotone-log-depth))
     (when (and (numberp depth) (< 0 depth))
       (setq cmds (append cmds (list (format "--last=%d" depth)))))