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

filemerge: add debug output for whether this is a change/delete conflict

Just like binary and symlink conflicts, change/delete conflicts influence the
tool picked.
parent c533435cbc37
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