Add a decoration for conflicts
tree30ba46d58d7f0ada392f855f78a0071c81370189
-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