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