Mercurial > hg
view tests/test-conflict @ 4876:001e8a745834
typo fix
author | Jesse Glick <jesse.glick@sun.com> |
---|---|
date | Thu, 12 Jul 2007 10:55:49 -0400 |
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