hgbook
annotate es/examples/extdiff @ 1113:613690ad6a9c
Merge with dongsheng
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sat Jul 10 16:21:26 2010 +0100 (2010-07-10) |
| parents | |
| children |
| rev | line source |
|---|---|
| igor@333 | 1 #!/bin/bash |
| igor@333 | 2 |
| igor@333 | 3 echo '[extensions]' >> $HGRC |
| igor@333 | 4 echo 'extdiff =' >> $HGRC |
| igor@333 | 5 |
| igor@333 | 6 hg init a |
| igor@333 | 7 cd a |
| igor@333 | 8 echo 'The first line.' > myfile |
| igor@333 | 9 hg ci -Ama |
| igor@333 | 10 echo 'The second line.' >> myfile |
| igor@333 | 11 |
| igor@333 | 12 #$ name: diff |
| igor@333 | 13 |
| igor@333 | 14 hg diff |
| igor@333 | 15 |
| igor@333 | 16 #$ name: extdiff |
| igor@333 | 17 |
| igor@333 | 18 hg extdiff |
| igor@333 | 19 |
| igor@333 | 20 #$ name: extdiff-ctx |
| igor@333 | 21 |
| igor@333 | 22 #$ ignore: ^\*\*\* a.* |
| igor@333 | 23 |
| igor@333 | 24 hg extdiff -o -NprcC5 |
| igor@333 | 25 |
| igor@333 | 26 #$ name: |
| igor@333 | 27 |
| igor@333 | 28 exit 0 |