Code

git notes merge: List conflicting notes in notes merge commit message