Search found 1 match
- Mon Nov 26, 2018 5:35 am
- Forum: Support (DiffMerge)
- Topic: Support conflict resolution using diff/diff3 format files
- Replies: 1
- Views: 17226
Support conflict resolution using diff/diff3 format files
Does DiffMerge have the ability to 1) Open a text file that contains conflict markers in the diff or diff3 format 2) Allow the user to navigate through the conflicts and resolve the conflicts in the DiffMerge conflict resolver UI In effect, DiffMerge should not to re-calculate the file differences i...