Merge branch 'rr/checkoutconflict'
tree1a4c6edddc5e386b7b53ff80488aa91f1deb4a1c
-rw-r--r-- 2290 INSTALL
-rw-r--r-- 8443 README
-rw-r--r-- 12982 SUBMITTING_PATCHES
-rw-r--r-- 5043 TODO
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.test
drwxr-xr-x - org.spearce.jgit