Mercurial > hg
view tests/test-conflict @ 12228:3ccd5b999500 stable
i18n: merge with stable
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Thu, 26 Aug 2010 22:27:20 -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