Bug 2955. Workaround for lack of atomic operations in GCCE standard libraries (fall back to default use of Mutex)
# To enable automatic merging of ChangeLog files, use the following command:# git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"ChangeLog* merge=changelog