cherry-pick/revert: add scissors line on merge conflict
[git] / t / t9604 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot