Mercurial > hg
view tests/test-conflict @ 9968:8c923a18e7ae
Merge with stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 30 Nov 2009 23:27:37 +0100 |
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