Mercurial > hg
view tests/test-conflict @ 8506:93a9f4a0e361
coal/paper: simplify margin and padding CSS rules
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 18 May 2009 23:37:36 +0200 |
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