Mercurial > evolve
diff docs/tutorial/style.css @ 4311:8aa28e68ac44 stable
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.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 21 Dec 2018 13:14:59 +0800 |
parents | aad37ffd7d58 |
children |