gitconfig diffconflicts