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

merge: introduce a preresolve function

The section of code that writes out the version of the file cached in the merge
state should only be run at preresolve time. This is so that if the premerge
keeps around conflict markers, those don't get overwritten before the main
merge.
parent 2f1fce0d4e86
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