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

merge.applyupdates: call driverpreprocess before starting merge actions

We also need to update our internal state to whatever state driverpreprocess
leaves it in.

Adding an error state separate from the unresolved count is too big a
refactoring for now, so we hack around it by setting it to a positive value to
indicate an error state.
parent e9a0d5f5c225
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