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

Bug 322876

Summary:	visual conflict editor
Product:	[Technology] EGit	Reporter:	nicolas de loof <nicolas.deloof>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	RESOLVED DUPLICATE	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	matthias.sohn
Version:	unspecified
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:

Description nicolas de loof

2010-08-17 04:15:05 EDT

Build Identifier: 20100617-1415

A conflict is displayed in EGit with decorators but the editor only shows the text-mode conflict marks "<<<<<<<" "=======" or ">>>>>>>". A 3-way conflict editor in Eclipse would be nicer

The git mergetool command allow to set the tool used to manually resolve the 3-way merge, when using command line Git. 



Reproducible: Always

Steps to Reproduce:
1. create a conflict
2. pull changes
3. open editor

Comment 1 Matthias Sohn

2010-10-20 04:30:42 EDT

this is a duplicate

*** This bug has been marked as a duplicate of bug 326525 ***