Skip to content
Snippets Groups Projects
Commit 8aa28e68ac44 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

evolve: detect unresolved conflict during evolve --continue (issue5966)

Evolve --continue was ignoring unresolved conflict, proceeding with its
operation without any check. This is now fixed.

This test case was built and formalized by Matt Harbison and Anton Shestakov.
parent 604732387e33
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