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

mergestate._resolve: handle change/delete conflicts

We will represent a deleted file as 'nullhex' in the in-memory and on-disk
merge states. We need to be able to create absentfilectxes in that case, and
delete the file from disk rather than try to write it out.
parent e1458049dca5
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