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

resolve: fix incorrect merge

The merge from stable into default was semantically incomplete -- a couple of
changes in preceding code had to be rewritten here.

This code only triggers for change/delete conflicts, so we can't test it yet.
We will soon be able to do it, though.
parent ceef5fb14872
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