From 8d019fac4470a31249cf2d3404bca5460d464d69 Mon Sep 17 00:00:00 2001
From: Rocco Rutte <pdmef@gmx.net>
Date: Mon, 5 Nov 2007 14:52:26 +0100
Subject: [PATCH] hg-commit: Exclude merges when writing ChangeLog

---
 hg-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hg-commit b/hg-commit
index e59ae97fa..a00346303 100755
--- 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
-- 
2.40.0