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

merge.mergestate: perform all premerges before any merges (BC)

We perform all that we can non-interactively before prompting the user for input
via their merge tool. This allows for a maximally consistent state when the user
is first prompted.

The test output changes indicate the actual behavior change happening.
parent dfd9811c5c9b
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