Mercurial > hgbook
view en/examples/issue29 @ 393:1ea91eb01030
Fixed sample output for 'daily.revert' test.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed, 20 Aug 2008 21:49:39 +0200 |
parents | 91a936be78b8 |
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