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