Bug 514817 - Show ancestor value during 3-way merge
Summary: Show ancestor value during 3-way merge
Status: NEW
Alias: None
Product: EMF.Diffmerge
Classification: Modeling
Component: UI (show other bugs)
Version: 0.7.0   Edit
Hardware: PC Windows 7
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact: Olivier Constant CLA
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-04-06 02:39 EDT by Michael Tiller CLA
Modified: 2017-09-12 04:13 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 Michael Tiller CLA 2017-04-06 02:39:54 EDT 
During a 3-way merge, when a value was changed in both the Target and the Reference, the UI only displays these values. It could be useful to also see the old ancestor value.
Comment 1 Olivier Constant CLA 2017-09-12 04:13:12 EDT 
Definitely.