Mercurial > hg
view tests/test-conflict @ 12212:bb63f0532aa6 stable
i18n-pt_BR: synchronized with 31dde4c3bb83
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Fri, 20 Aug 2010 21:22:57 -0300 |
parents | 93a4e72b4f83 |
children |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" hg merge 1 hg id cat a hg status