Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 5263:d59ed18ec2d0
Merge with crew-stable
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 29 Aug 2007 16:19:27 -0700 |
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