Mercurial > hg
view tests/test-conflict @ 9671:9471d9a900b4
transfer branchmap branch names over the wire in utf-8
author | Henrik Stuart <henrik.stuart@edlund.dk> |
---|---|
date | Mon, 26 Oct 2009 13:37:39 +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