hgbook

view es/examples/issue29 @ 775:85f013a831d9

find changesets by author, revision, files, or words in the commit message
Keep the original text of the license due to lack of an existing Italian translation with equivalent legal validity.
author Giulio@puck
date Tue Aug 04 18:30:58 2009 +0200 (2009-08-04)
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