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