Make attempt to refresh when merge conflicts exists more user friendly
treeb1a8261a9f1d8b424b6f7a7c35ccb2fafce07ed7
-rw-r--r-- 5351 README
-rw-r--r-- 12982 SUBMITTING_PATCHES
-rw-r--r-- 5043 TODO
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.jgit