Bug 199438 - [usability][editors] Provide a "diff files" option on the editor save conflict dialog
Summary: [usability][editors] Provide a "diff files" option on the editor save conflic...
Status: NEW
Alias: None
Product: Target Management
Classification: Tools
Component: RSE (show other bugs)
Version: 2.0   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: Future   Edit
Assignee: David McKnight CLA
QA Contact: Martin Oberhuber CLA
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-08-09 10:59 EDT by Martin Oberhuber CLA
Modified: 2009-03-23 12:22 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 Martin Oberhuber CLA 2007-08-09 10:59:40 EDT 
+++ This bug was initially created as a clone of Bug #199418 +++

On the editor save conflict dialog, it would be a great enhancement to have a fourth option of opening a diff/merge viewer filled with the local edited file on the left, and the remote file on the right. That way, any differences could be merged in right away rather than having to save under a different name first.