hgbook

view fr/examples/issue29 @ 1004:0298bccbb8ee

find changesets by author, revision, files, or words in the commit message
french small corrections, gestion de révisions au lieu de gestion de sources ou gestion de versions.
author Wilk
date Sun Sep 13 14:08:00 2009 +0200 (2009-09-13)
parents 91a936be78b8
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