Paolo Bonzini wrote:
I committed the following patch to bootstrap, so that git-merge-changelog is used if available.
And here is the .gitattributes file: diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e8495d5 --- a/.gitattributes +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog Paolo
