hg-commit: Exclude merges when writing ChangeLog

diff --git a/hg-commit b/hg-commit
index e59ae97fabae29ab7c524cde0f08f1480bf7d0c2..a00346303f7a2055442e2c437d0eda908753d5c4 100755 (executable)
--- a/hg-commit
+++ b/hg-commit
@@ -28,7 +28,7 @@ do
 done
 
 {
-  hg log --style=./hg-changelog-map -r tip:$lrev
+  hg log --no-merges --style=./hg-changelog-map -r tip:$lrev
   hg cat ChangeLog
 } > ChangeLog
 ${VISUAL:-${EDITOR-:vi}} ChangeLog