Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 4692:c135c6cddbec
Command in doc comment is now on a single line, fixed
after previous formatting broke it.
author | paul sorenson <sf@metrak.com> |
---|---|
date | Sat, 23 Jun 2007 22:25:11 -0500 |
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