Mercurial > evolve

view docs/makefile @ 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 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