Mercurial > hgbook
view en/examples/issue29 @ 156:91a936be78b8
Document merge behaviour with file names.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 12 Mar 2007 23:11:26 -0700 |
parents | |
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