git notes merge: Handle real, non-conflicting notes merges
[git] / t / t9602 /
drwxr-xr-x   ..
-rw-r--r-- 2288 README
drwxr-xr-x - cvsroot