hgbook

view es/examples/issue29 @ 358:15a6b61335aa

find changesets by author, revision, files, or words in the commit message
translated a couple of paragraphs, and updated the table of works in progress
author Javier Rojas <jerojasro@devnull.li>
date Thu Oct 23 23:18:59 2008 -0500 (2008-10-23)
parents
children
line source
1 #!/bin/bash
2
3 #$ name: go
4
5 hg init issue29
6 cd issue29
7 echo a > a
8 hg ci -Ama
9 echo b > b
10 hg ci -Amb
11 hg up 0
12 mkdir b
13 echo b > b/b
14 hg ci -Amc
15
16 #$ ignore: abort: Is a directory: .*
17 hg merge
18
19 #$ name:
20 # This error is expected from the failed merge.
21
22 exit 0