git notes merge: Handle real, non-conflicting notes merges
[git] / t / t9601 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot