Fix merges involving subtrees with StrategySimpleTwoWayInCore
[jgit.git] / org.spearce.egit.core / 
tree915ea859adea3faf43330415d52c7efc501858dc
drwxr-xr-x   ..
-rw-r--r-- 367 .classpath
-rw-r--r-- 4 .gitignore
-rw-r--r-- 44 .options
-rw-r--r-- 654 .project
drwxr-xr-x - .settings
-rw-r--r-- 11252 LICENSE
drwxr-xr-x - META-INF
-rw-r--r-- 165 build.properties
-rw-r--r-- 63 plugin.properties
-rw-r--r-- 573 plugin.xml
drwxr-xr-x - src