Add a few simple merge test casesmaster
[egit/charleso.git] / org.spearce.jgit.test / tst / org / spearce / jgit / merge / 
tree4a8f8c505bfea40b2a6268fd3f81e8d2ca6803d9
drwxr-xr-x   ..
-rw-r--r-- 3657 SimpleMergeTest.java