git: changing to DiffMerge