Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 322876 - visual conflict editor
Summary: visual conflict editor
Status: RESOLVED DUPLICATE of bug 326525
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-08-17 04:15 EDT by nicolas de loof CLA
Modified: 2010-10-20 04:30 EDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description nicolas de loof CLA 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 CLA 2010-10-20 04:30:42 EDT 
this is a duplicate

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