Mercurial > hgbook
view es/examples/issue29 @ 443:cbffdb4dde82
added terms from the svnbook translation project
author | jerojasro@localhost |
---|---|
date | Sun, 19 Oct 2008 20:18:42 -0500 |
parents | 04c08ad7e92e |
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