Mercurial > evolve

diff debian/rules @ 4311:8aa28e68ac44 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9fa3585b160f
children a1d191feaa84
line wrap: on
line diff