0e7d7b87f33b5ec8c75a3a0a9b16fae082d06348

 1diff --git a/tools/changelog.sh b/tools/changelog.sh
 2index 836afef147bb60ff849372199eba949a7c501a06..56ea42cb1e0c2db56263b14323b8c56ee4731ba9 100755
 3--- a/tools/changelog.sh
 4+++ b/tools/changelog.sh
 5@@ -114,6 +114,11 @@ function parse-commit {
 6     fi
 7   }
 8 
 9+  # Ignore commit if it is a merge commit
10+  if [[ $(command git show -s --format=%p $1 | wc -w) -gt 1 ]]; then
11+    return
12+  fi
13+
14   # Parse commit with hash $1
15   local hash="$1" subject body warning rhash
16   subject="$(command git show -s --format=%s $hash)"