Mercurial > hg
view tests/test-conflict @ 7909:179fac5c10d8
coal/paper: Turn <img> into <img/> where missing
author | Rocco Rutte <pdmef@gmx.net> |
---|---|
date | Sat, 28 Mar 2009 22:22:22 +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