X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Fcollision.cc;h=edf04de23d06f91e3fbf1d54ff3333177dd67523;hb=7d2ec0f1c47d211f243cf5646b35ef5298d8c82a;hp=a6bf46e56cc85da7374356e3564d00697da529ff;hpb=9d08763c0601ede497f2f0960b26bc3872a74bf6;p=lilypond.git

diff --git a/lily/collision.cc b/lily/collision.cc
index a6bf46e56c..edf04de23d 100644
--- a/lily/collision.cc
+++ b/lily/collision.cc
@@ -153,8 +153,11 @@ Collision::automatic_shift ()
       
       bool merge  =
 	downpos == uppos
-	&& nu_l->balltype_i () == nd_l->balltype_i ()
-	&& nu_l->dots_i () == nd_l->dots_i ();
+	&& nu_l->balltype_i () == nd_l->balltype_i ();
+
+
+      if (!to_boolean (get_elt_property ("merge-differently-dotted")))
+	merge = merge && nu_l->dot_count () == nd_l->dot_count ();
 
       /*
 	notes are close, but can not be merged.  Shift