Mercurial > hg
view tests/test-conflict @ 5792:956e01c31914
color extension: change from GPL3 to 2
author | Kevin Christen <kevin.christen@gmail.com> |
---|---|
date | Thu, 03 Jan 2008 20:27:32 -0600 |
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