Mercurial > hg
view tests/test-conflict @ 7953:8c6f823efcc9
Correct a bug on date formats with '>' or '<' accompanied by space characters.
author | Justin Peng <justin.peng.sw@gmail.com> |
---|---|
date | Wed, 01 Apr 2009 09:11:00 -0700 |
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