Public Git Hosting - egit.git/commit

commit	dca4164e203544f891ecd2d1389577062eb6f487
author	Robin Rosenberg <robin.rosenberg@dewire.com>
	Wed, 20 Jun 2007 18:31:48 +0000 (20 20:31 +0200)
committer	Robin Rosenberg <robin.rosenberg@dewire.com>
	Sun, 24 Jun 2007 15:46:18 +0000 (24 17:46 +0200)
tree	30ba46d58d7f0ada392f855f78a0071c81370189	tree \| snapshot (tar.gz zip)
parent	33022044f9d5d3451d8caf6eb14f698196734b73	commit \| diff

Add a decoration for conflicts

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>

org.spearce.egit.ui/icons/ovr/conflict.gif	[new file with mode: 0644]	blob
org.spearce.egit.ui/src/org/spearce/egit/ui/UIIcons.java		diff \| blob \| blame \| history
org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitResourceDecorator.java		diff \| blob \| blame \| history
org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java		diff \| blob \| blame \| history

Eclipse Git Team Provider