TGitMerge: Don't use theirs/mine