git notes merge: Handle real, non-conflicting notes merges