comparison tests/test-extdiff @ 2980:94def4db6cd4

merge.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 22 Aug 2006 07:32:54 -0700
parents 61fcd9fac434
children 49966b5ab16f
comparison
equal deleted inserted replaced
2979:985594e891b8 2980:94def4db6cd4
1 #!/bin/sh 1 #!/bin/sh
2 2
3 HGRCPATH=$HGTMP/.hgrc; export HGRCPATH 3 echo "[extensions]" >> $HGRCPATH
4 echo "[extensions]" >> $HGTMP/.hgrc 4 echo "extdiff=" >> $HGRCPATH
5 echo "extdiff=" >> $HGTMP/.hgrc
6 5
7 hg init a 6 hg init a
8 cd a 7 cd a
9 echo a > a 8 echo a > a
10 hg add 9 hg add
12 if [ $? -ne 0 ]; then 11 if [ $? -ne 0 ]; then
13 opt="-p gdiff" 12 opt="-p gdiff"
14 fi 13 fi
15 hg extdiff -o -Nr $opt 14 hg extdiff -o -Nr $opt
16 15
17 echo "[extdiff]" >> $HGTMP/.hgrc 16 echo "[extdiff]" >> $HGRCPATH
18 echo "cmd.falabala=echo" >> $HGTMP/.hgrc 17 echo "cmd.falabala=echo" >> $HGRCPATH
19 echo "opts.falabala=diffing" >> $HGTMP/.hgrc 18 echo "opts.falabala=diffing" >> $HGRCPATH
20 19
21 hg falabala 20 hg falabala
22 21
23 hg help falabala 22 hg help falabala
24 23