evolve: pop up editor if conflicts occur while merging commit messages Last patch added support for merging commit messages while resolving content divergence. In case of conflicts we fallback to one of the divergent commit messages. After this patch, we will pop up an editor where user has to resolve the conflicts in the commit messages and then continue. Tests are added for this. We need to fix handling in test-sharing.t to use HGEDITOR to fix conflicts and pass the new commit message. Future improvement can be that we should respect HGMERGE while merging commit descriptions too.

     1

#!/bin/bash

     2

set -eox pipefail

     3

     4

     5

function compile {

     6

    pandoc \

     7

    -s $1 \

     8

    -o $2 \

     9

    --toc --toc-depth=4 \

    10

    -F pandocfilters/examples/graphviz.py -F mypandocfilters/graphviz-file.py -F mypandocfilters/raw-file.py \

    11

    -t html5 \

    12

    --template standalone.html --variable=template_css:uikit.css

    13

    14

}

    15

    16

compile slides.md index.html