Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 376880

Summary:	Inline compare annotation overview ruler doesn't show conflicts
Product:	[ECD] Orion	Reporter:	Max Li <maxli>
Component:	Client	Assignee:	libing wang <libingw>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	libingw
Version:	0.5
Target Milestone:	0.5 M2
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Max Li

2012-04-16 10:58:22 EDT

1. Rebase or cherry-pick a commit so that there are conflicts.
2. On the git status page, click to view the inline compare of a file with a conflict.
3. The overview ruler is all blue (no red), in contrast to the two-way compare which does have it.

Comment 1 libing wang

2012-04-16 16:19:16 EDT

We also need special color(now yellowish) for the diff block on conflicting area.
It was reddish before but now it is used for deletion.

Comment 2 libing wang

2012-04-17 14:49:56 EDT

fixed with http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=ae69ff2c3b8035a2a297c2b4b238ffa8c232a172.
The pair of the conflicting blocks are still rendered as yellow but you can tell by the inner word changes.