Add a few simple merge test casesmaster
[egit/charleso.git] / org.spearce.jgit / 
tree4f4135a9659f62f570f84e419c3837496145b438
drwxr-xr-x   ..
-rw-r--r-- 367 .classpath
-rw-r--r-- 4 .gitignore
-rw-r--r-- 649 .project
drwxr-xr-x - .settings
-rw-r--r-- 1567 LICENSE
drwxr-xr-x - META-INF
-rw-r--r-- 111 build.properties
drwxr-xr-x - lib
-rw-r--r-- 52 plugin.properties
drwxr-xr-x - src