Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 2877:982c3237c63d
Make clear that hg pull -r REV pulls "up to" a revision.
The existing message was a bit confusing, making the reader
believe that only the specific revision is pulled.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Sun, 13 Aug 2006 18:35:24 +0300 |
parents | e506c14382fd |
children | 46280c004f22 |
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" HGMERGE=merge; export HGMERGE hg merge 1 hg id egrep -v ">>>|<<<" a hg status