Add a few simple merge test cases
[egit/imyousuf.git] / org.spearce.egit.ui / src / 
treeb059a9a125a87f9cf96e6bf8b6ecdcc012985f3f
drwxr-xr-x   ..
drwxr-xr-x - org