DiffMerge configuration for git