simplify output of conflicting merge
[git/mingw.git] / t / t9700 / 
tree4f08bb3031b50a2a2b707cbd0af69e6d5da94487
drwxr-xr-x   ..
-rwxr-xr-x 4265 test.pl