Mercurial > hg
view tests/test-conflict @ 5940:7b222815a462
Add back elipsis to [OPTION] that was stolen by 56e8a54bf71d
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 25 Jan 2008 20:17:48 +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