1 # To enable automatic merging of ChangeLog files, use the following command:

     2 # git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"

     3 ChangeLog* merge=changelog

     4