Add a few simple merge test casesmaster
[egit/charleso.git] / org.spearce.egit.core / src / 
tree9eaae4c7db96f85565fe7dd79262408dceddb0b4
drwxr-xr-x   ..
drwxr-xr-x - org