filemerge: add support for change/delete conflicts to the ':other' merge tool
This, along with the previous patch to the :local merge tool, covers the full matrix of change/delete conflicts.
Loading
Please register or sign in to comment
This, along with the previous patch to the :local merge tool, covers the full matrix of change/delete conflicts.