view docs/tutorial/compile.sh @ 3978:fb8e44c70798 stable

evolve: set the second parent if we get conflicts while evolving

This patch makes sure we set the second parent correctly if we run into
conflicts while evolving. Also, we need to make sure to reset to one parent
before committing.

#!/bin/bash
set -eox pipefail


function compile {
    pandoc \
    -s $1 \
    -o $2 \
    --toc --toc-depth=4 \
    -F pandocfilters/examples/graphviz.py -F mypandocfilters/graphviz-file.py -F mypandocfilters/raw-file.py \
    -t html5 \
    --template standalone.html --variable=template_css:uikit.css

}

compile slides.md index.html