hgbook
view fr/examples/issue29 @ 991:e6894aa7baf2
French translation; ch04-concepts.xml; 10percent
| author | Jean-Marie Clément <JeanMarieClement@web.de> |
|---|---|
| date | Mon Sep 07 23:16:08 2009 +0200 (2009-09-07) |
| parents | 91a936be78b8 |
| children |
line source
1 #!/bin/bash
3 #$ name: go
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
16 #$ ignore: abort: Is a directory: .*
17 hg merge
19 #$ name:
20 # This error is expected from the failed merge.
22 exit 0