Mercurial > evolve
view docs/makefile @ 3828:c58ebf5d2f57
tests: add more test of --stop while resolving content-divergence
This tests the --stop flag when conflicts occur while relocating one of the
divergent changesets.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 11 Jun 2018 01:00:57 +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