hgbook
view 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 |
line source
1 #!/bin/bash
3 echo '[extensions]' >> $HGRC
4 echo 'extdiff =' >> $HGRC
6 hg init a
7 cd a
8 echo 'The first line.' > myfile
9 hg ci -Ama
10 echo 'The second line.' >> myfile
12 #$ name: diff
14 hg diff
16 #$ name: extdiff
18 hg extdiff
20 #$ name: extdiff-ctx
22 #$ ignore: ^\*\*\* a.*
24 hg extdiff -o -NprcC5
26 #$ name:
28 exit 0