Mercurial > hg
view tests/test-merge-default @ 4516:96d8a56d4ef9
Removed trailing whitespace and tabs from python files
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 06 Jun 2007 20:22:52 +0200 |
parents | 013921c753bd |
children | 9cd6578750b9 |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg commit -A -ma echo a >> a hg commit -mb echo a >> a hg commit -mc hg up 1 echo a >> a hg commit -md hg up 1 echo a >> a hg commit -me hg up 1 echo % should fail because not at a head hg merge hg up echo % should fail because \> 2 heads hg merge echo % should succeed hg merge 2 hg commit -mm1 echo % should succeed - 2 heads hg merge hg commit -mm2 echo % should fail because 1 head hg merge true