Skip to content
Snippets Groups Projects
Commit a8908c139f2f authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

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.
parent 63d6bc874dea
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment