Mercurial > hg
view tests/test-issue842 @ 11452:eac141407b85 stable
merge: document how to 'undo' a merge
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 27 Jun 2010 17:41:43 -0500 |
parents | cb93eee1fbcd |
children |
line wrap: on
line source
#!/bin/sh hg init test cd test echo foo > a hg ci -Ama hg up -r0000 echo bar > a echo % should issue warning hg ci -Amb hg up -r0000 echo stuffy > a echo % should not issue warning hg ci -q -Amc hg up -r0000 echo crap > a hg branch testing echo % should not issue warning hg ci -q -Amd