filemerge._mergecheck: add check for change/delete conflicts
Merge tools that perform an actual 3-way merge can't handle change/delete conflicts. This adds a check for that.
Loading
Please register or sign in to comment
Merge tools that perform an actual 3-way merge can't handle change/delete conflicts. This adds a check for that.