Mercurial > evolve
view docs/makefile @ 3823:7b33a6ed0539
tests: add test for --stop flag when resolving multiparents content-div
This patch adds a test for --stop flag when we are in an interrupted
content-divergent resolution which have multiple parents. Conflicts happen we
merge the divergent changesets after relocation. The test shows that we
need to strip the relocated changeset.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sun, 10 Jun 2018 22:38:08 +0530 |
parents | 1a4f26eec0af |
children | 150be007f421 |
line wrap: on
line source
all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico sphinx-build . ../html/ tutorials/tutorial.rst: tutorials/tutorial.t test2rst.py python test2rst.py tutorials/ tutorials/topic-tutorial.rst: tutorials/topic-tutorial.t test2rst.py python test2rst.py tutorials/ static/logo-evolve.ico: static/logo-evolve.svg convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico