git log: don't do merge diffs by default