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