Fix comment about merging

diff --git a/ChangeLog b/ChangeLog
index b24cb06d20439b63b8028c1c6746a01b842a2694..7cc724f54678d7fe83f5f92f132989e63b69ef61 100644 (file)
--- 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 24a9a532cfdd28492e097cc4e1f5399ea087f539..1df0a6c7aba7f8d0ff68ef226ee174fae7c089b8 100644 (file)
--- 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. */