Search found 1 match
- Fri May 11, 2012 3:58 pm
- Forum: Support (DiffMerge)
- Topic: Feature Request: Merge from both sides in 3 way merge
- Replies: 1
- Views: 7617
Feature Request: Merge from both sides in 3 way merge
I've been a long time DiffMerge user and for the part have been very happy with it. One thing I would like to see though is being able to merge both sides of a conflict to the resulting file in a 3 way merge. Oftentimes I find that the conflicts that can't be automatically merged need to be resolved...