Add full date to git log messages. Explisitely use kdiff3 for merge.