Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 5277:a32a8e50d233
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 31 Aug 2007 23:15:44 +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