fix (GitConfiguration): Mine / Theirs reversed for DiffMerge