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

filemerge: don't try using external tools on change/delete conflicts

This is mostly for completeness' sake -- the current code shouldn't get to this
point.
parent 0e330f59
No related branches found
No related tags found
Loading
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