hgbook
annotate en/examples/extdiff @ 356:0db175abfaf3
some friggin' merge or something like that.
| author | jerojasro@localhost |
|---|---|
| date | Tue Oct 21 22:41:51 2008 -0500 (2008-10-21) |
| parents | eef2171243e8 |
| children |
| rev | line source |
|---|---|
| bos@226 | 1 #!/bin/bash |
| bos@226 | 2 |
| bos@226 | 3 echo '[extensions]' >> $HGRC |
| bos@226 | 4 echo 'extdiff =' >> $HGRC |
| bos@226 | 5 |
| bos@226 | 6 hg init a |
| bos@226 | 7 cd a |
| bos@226 | 8 echo 'The first line.' > myfile |
| bos@226 | 9 hg ci -Ama |
| bos@226 | 10 echo 'The second line.' >> myfile |
| bos@226 | 11 |
| bos@226 | 12 #$ name: diff |
| bos@226 | 13 |
| bos@226 | 14 hg diff |
| bos@226 | 15 |
| bos@226 | 16 #$ name: extdiff |
| bos@226 | 17 |
| bos@226 | 18 hg extdiff |
| bos@226 | 19 |
| bos@226 | 20 #$ name: extdiff-ctx |
| bos@226 | 21 |
| bos@227 | 22 #$ ignore: ^\*\*\* a.* |
| bos@227 | 23 |
| bos@226 | 24 hg extdiff -o -NprcC5 |
| bos@226 | 25 |
| bos@226 | 26 #$ name: |
| bos@226 | 27 |
| bos@226 | 28 exit 0 |