gitconfig: Reuse recorded resolution of conflicted merges