Mercurial > evolve

view docs/makefile @ 4636:c0e9a3c01c44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: consider using three way merge to get the user for div resolution This patch adds the logic to merge the users from two divergent csets considering the base (i.e three way merge). The case when all the three are different, we concatenate the two authors of divergent csets.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sun, 05 May 2019 18:24:59 +0530
parents 150be007f421
children 77729ad7cb0c
line wrap: on
line source

SPHINXBUILD ?= sphinx-build

all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
	$(SPHINXBUILD) . ../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