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