comparison tests/test-histedit-non-commute.t @ 20306:fe8e254c7ad6 stable

merge default into stable for 2.9 code freeze
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Jan 2014 14:30:06 -0600
parents aa9385f983fa
children 19d6fec60b81
comparison
equal deleted inserted replaced
20213:8c69c69dbcd2 20306:fe8e254c7ad6
1 $ . "$TESTDIR/histedit-helpers.sh" 1 $ . "$TESTDIR/histedit-helpers.sh"
2 2
3 $ cat >> $HGRCPATH <<EOF 3 $ cat >> $HGRCPATH <<EOF
4 > [extensions] 4 > [extensions]
5 > graphlog=
6 > histedit= 5 > histedit=
7 > EOF 6 > EOF
8 7
9 $ initrepo () 8 $ initrepo ()
10 > { 9 > {