Details
-
Suggestion
-
Resolution: Unresolved
-
None
-
None
Description
External diff isn't that useful on a conflicted file, so maybe change it to 'Visual Merge' when selecting conflicts? The problem is what to do when a mixture of file statuses are selected.