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

Bug 360966

Summary: Handle empty conflict
Product: [Modeling] EMFStore Reporter: Edgar Mueller <emueller>
Component: ServerCoreAssignee: Edgar Mueller <emueller>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: emueller
Version: unspecified   
Target Milestone: ---   
Hardware: PC   
OS: All   
Whiteboard:

Description Edgar Mueller CLA 2011-10-14 09:42:16 EDT 
If conflicts can be resolved automatically an empty merge dialog is shown regardless
Comment 1 Edgar Mueller CLA 2011-10-14 10:24:24 EDT 
Empty conflicts will no longer cause the MergeDialog to pop up