Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-extdiff @ 3751:797c6e70092b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't require a diff which accepts the -N option.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Dec 2006 22:29:47 +0100
parents 49966b5ab16f
children 2be225ea5722
comparison
equal deleted inserted replaced
3750:0f550b87deb8 3751:797c6e70092b
5 5
6 hg init a 6 hg init a
7 cd a 7 cd a
8 echo a > a 8 echo a > a
9 hg add 9 hg add
10 diff -N /dev/null /dev/null 2> /dev/null 10 hg extdiff -o -r $opt
11 if [ $? -ne 0 ]; then
12 opt="-p gdiff"
13 fi
14 hg extdiff -o -Nr $opt
15 11
16 echo "[extdiff]" >> $HGRCPATH 12 echo "[extdiff]" >> $HGRCPATH
17 echo "cmd.falabala=echo" >> $HGRCPATH 13 echo "cmd.falabala=echo" >> $HGRCPATH
18 echo "opts.falabala=diffing" >> $HGRCPATH 14 echo "opts.falabala=diffing" >> $HGRCPATH
19 15