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