Teach resolve-ChangeLogs to act as a merge-driver for Git