Mercurial > hgbook
comparison ja/examples/backout @ 834:896ab6eaf1c6
merged
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Fri, 10 Jul 2009 02:32:17 +0900 |
| parents | en/examples/backout@7226e5e750a6 en/examples/backout@b0db5adf11c1 |
| children |
comparison
equal
deleted
inserted
replaced
| 803:5276f40fca1c | 834:896ab6eaf1c6 |
|---|---|
| 66 | 66 |
| 67 #$ name: manual.heads | 67 #$ name: manual.heads |
| 68 | 68 |
| 69 hg heads | 69 hg heads |
| 70 | 70 |
| 71 #$ name: | |
| 72 | |
| 73 echo 'first change' > myfile | |
| 74 | |
| 71 #$ name: manual.cat | 75 #$ name: manual.cat |
| 72 | 76 |
| 73 cat myfile | 77 cat myfile |
| 74 | 78 |
| 75 #$ name: manual.merge | 79 #$ name: manual.merge |