merge-recursive: demonstrate an incorrect conflict with submodule
[git/dscho.git] / t / t7006 / 
treeaa3539b8c8a322760f6224722b8074bf51a25232
drwxr-xr-x   ..
-rwxr-xr-x 1272 test-terminal.perl