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

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.
parent d7517deedf86
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