hgbook
annotate ja/examples/extdiff @ 963:1dd00abb3fa9
merge with bryan - it's been a while but everything seems ok
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Sun Aug 16 03:41:39 2009 +0200 (2009-08-16) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 #!/bin/bash |
| foozy@708 | 2 |
| foozy@708 | 3 echo '[extensions]' >> $HGRC |
| foozy@708 | 4 echo 'extdiff =' >> $HGRC |
| foozy@708 | 5 |
| foozy@708 | 6 hg init a |
| foozy@708 | 7 cd a |
| foozy@708 | 8 echo 'The first line.' > myfile |
| foozy@708 | 9 hg ci -Ama |
| foozy@708 | 10 echo 'The second line.' >> myfile |
| foozy@708 | 11 |
| foozy@708 | 12 #$ name: diff |
| foozy@708 | 13 |
| foozy@708 | 14 hg diff |
| foozy@708 | 15 |
| foozy@708 | 16 #$ name: extdiff |
| foozy@708 | 17 |
| foozy@708 | 18 hg extdiff |
| foozy@708 | 19 |
| foozy@708 | 20 #$ name: extdiff-ctx |
| foozy@708 | 21 |
| foozy@708 | 22 #$ ignore: ^\*\*\* a.* |
| foozy@708 | 23 |
| foozy@708 | 24 hg extdiff -o -NprcC5 |
| foozy@708 | 25 |
| foozy@708 | 26 #$ name: |
| foozy@708 | 27 |
| foozy@708 | 28 exit 0 |