Teach merge.log to "git-merge" again