Merge "Prepare EGit for the new State MERGING_RESOLVED"
tree874876977990c60d7184e5ef88692cc03a65d545
-rw-r--r-- 348 .eclipse_iplog
-rw-r--r-- 17 .gitattributes
-rw-r--r-- 2274 EGIT_INSTALL
-rw-r--r-- 11252 LICENSE
-rw-r--r-- 4597 README
-rw-r--r-- 3781 SUBMITTING_PATCHES
drwxr-xr-x - org.eclipse.egit-feature
drwxr-xr-x - org.eclipse.egit-updatesite
drwxr-xr-x - org.eclipse.egit.core.test
drwxr-xr-x - org.eclipse.egit.core
drwxr-xr-x - org.eclipse.egit.doc
drwxr-xr-x - org.eclipse.egit.ui.test
drwxr-xr-x - org.eclipse.egit.ui
drwxr-xr-x - org.eclipse.egit
-rw-r--r-- 5705 pom.xml
drwxr-xr-x - tools