evolve: fix the conflicts error message during content-divergence resolution Before last patch, we didn't had an automated way to continue an interrupted content-divergence resolution and we used to show a very long error message on how to continue manually. This patch replaces that long error message with nice small message which tells how to continue and how to abort. We still show `hg update -C .` to abort as we need to test and make `--abort` work in case of content-divergence.

     1

. $TESTDIR/testlib/pythonpath.sh

     2

     3

mkcommit() {

     4

   echo "$1" > "$1"

     5

   hg add "$1"

     6

   hg ci -m "$1"

     7

}

     8

     9

getid() {

    10

   hg log --hidden --template '{node}\n' --rev "$1"

    11

}

    12

    13

cat >> $HGRCPATH <<EOF

    14

[alias]

    15

debugobsolete=debugobsolete -d '0 0'

    16

EOF