Mercurial > evolve

comparison docs/conf.py @ 3736:4b8c63d14f18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: store the evolvestate file when encountering conflicts This patch makes `hg evolve` store the evolvestate file when it encounters merge conflicts while resolving content-divergence.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 29 Apr 2018 18:48:36 +0530
parents 9aec8fec2bf8
children ce163aaeba37
comparison
equal deleted inserted replaced
3735:bdf7fb6af7b8 3736:4b8c63d14f18