Code

git-merge documentation: more details about resolving conflicts