gitconfig and diffconflicts references