From: Erlend Aasland <erlenda@gmail.com>
Date: Wed, 19 Apr 2006 07:55:04 +0000 (+0000)
Subject: Fix comment about merging
X-Git-Tag: release/2.9.3~46
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2629d27674cdc52137a4fb0ce62200cfb7ce7e91;p=lilypond.git

Fix comment about merging
---

diff --git a/ChangeLog b/ChangeLog
index b24cb06d20..7cc724f546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
 
 	* ps/music-drawing-routines.ps (draw_dashed_slur): fix another bug
 
+	* lily/note-collision.cc: fix a comment
+
 2006-04-18  Heikki Junes  <hjunes@cc.hut.fi>
 
 	* stepmake/bin/add-html-footer.py: fix footer position in
diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 24a9a532cf..1df0a6c7ab 100644
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -48,7 +48,8 @@ check_meshing_chords (Grob *me,
   if (ups[0] > dps.back () + 1)
     return;
 
-  // FIXME: what's this?
+  /* Merge heads if the notes lie the same line, or if the "stem-up-note" is
+     above the "stem-down-note". */
   bool merge_possible = (ups[0] >= dps[0]) && (ups.back () >= dps.back ());
 
   /* Do not merge notes typeset in different style. */