comparison tests/test-unstability-resolution-result.t @ 5823:fd039a7f0c3c mercurial-5.6

test-compat: merge stable into mercurial-5.6 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 12:29:50 +0800
parents 0095a5240db5 a1dad44fe3da
children 43c4db536990
comparison
equal deleted inserted replaced
5757:25257b1be6c6 5823:fd039a7f0c3c
6 basic case for each type. 6 basic case for each type.
7 7
8 XXX dispatching each these test case in appropriate file would make sense. 8 XXX dispatching each these test case in appropriate file would make sense.
9 9
10 $ cat >> $HGRCPATH <<EOF 10 $ cat >> $HGRCPATH <<EOF
11 > [defaults]
12 > amend=-d "0 0"
13 > [extensions] 11 > [extensions]
14 > hgext.rebase= 12 > hgext.rebase=
15 > EOF 13 > EOF
16 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH 14 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
17 15