Fix wrong display string in Checkout Conflict dialog
treef5e302f878f86143e60e3b9150cf52575168d354
-rw-r--r-- 806 .eclipse_iplog
-rw-r--r-- 17 .gitattributes
-rw-r--r-- 2520 EGIT_INSTALL
-rw-r--r-- 11252 LICENSE
-rw-r--r-- 4622 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.mylyn-feature
drwxr-xr-x - org.eclipse.egit.mylyn.ui
drwxr-xr-x - org.eclipse.egit.source-feature
drwxr-xr-x - org.eclipse.egit.ui.test
drwxr-xr-x - org.eclipse.egit.ui
drwxr-xr-x - org.eclipse.egit
-rw-r--r-- 9492 pom.xml
drwxr-xr-x - tools