Mercurial > evolve
view docs/makefile @ 3810:04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
This patch adds test of resolution of content-divergent changesets when
relocation is required and it leads to conflicts. The test shows that we are not
doing the right thing. This will be fixed in upcoming patches.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 07 Jun 2018 22:45:54 +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