Mercurial > hgbook
view ja/examples/issue29 @ 834:896ab6eaf1c6
merged
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Fri, 10 Jul 2009 02:32:17 +0900 |
parents | b0db5adf11c1 |
children |
line wrap: on
line source
#!/bin/bash #$ name: go hg init issue29 cd issue29 echo a > a hg ci -Ama echo b > b hg ci -Amb hg up 0 mkdir b echo b > b/b hg ci -Amc #$ ignore: abort: Is a directory: .* hg merge #$ name: # This error is expected from the failed merge. exit 0