Introduce ThreeWayMerge API
tree295bc36f42b97a51f883fa345ba94b20f55a5a9b
-rw-r--r-- 17 .gitattributes
-rw-r--r-- 30 .gitignore
-rw-r--r-- 2264 EGIT_INSTALL
-rw-r--r-- 6536 README
-rw-r--r-- 13682 SUBMITTING_PATCHES
-rw-r--r-- 2179 TODO
drwxr-xr-x - jgit-maven
-rwxr-xr-x 1018 jgit.sh
-rwxr-xr-x 2236 make_jgit.sh
drwxr-xr-x - org.spearce.egit-feature
drwxr-xr-x - org.spearce.egit-updatesite
drwxr-xr-x - org.spearce.egit.core.test
drwxr-xr-x - org.spearce.egit.core
drwxr-xr-x - org.spearce.egit.ui
drwxr-xr-x - org.spearce.egit
drwxr-xr-x - org.spearce.jgit.pgm
drwxr-xr-x - org.spearce.jgit.test
drwxr-xr-x - org.spearce.jgit
-rwxr-xr-x 887 tag_egit.sh