Mercurial > hgbook
annotate ja/examples/extdiff @ 834:896ab6eaf1c6
merged
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Fri, 10 Jul 2009 02:32:17 +0900 |
parents | b0db5adf11c1 |
children |
rev | line source |
---|---|
226
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 #!/bin/bash |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 echo '[extensions]' >> $HGRC |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 echo 'extdiff =' >> $HGRC |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 hg init a |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 cd a |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 echo 'The first line.' > myfile |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 hg ci -Ama |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 echo 'The second line.' >> myfile |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 #$ name: diff |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 hg diff |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 #$ name: extdiff |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 hg extdiff |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
19 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 #$ name: extdiff-ctx |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
21 |
227
9be45345065a
Make test more robust.
Bryan O'Sullivan <bos@serpentine.com>
parents:
226
diff
changeset
|
22 #$ ignore: ^\*\*\* a.* |
9be45345065a
Make test more robust.
Bryan O'Sullivan <bos@serpentine.com>
parents:
226
diff
changeset
|
23 |
226
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
24 hg extdiff -o -NprcC5 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
25 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
26 #$ name: |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
27 |
eef2171243e8
Document the extdiff extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
28 exit 0 |