Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 2354:16276b1c0658
Manifest groups may be empty, so don't abort in this case (fixes issue210).
Only abort on empty changelog and file revlogs.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 31 May 2006 22:25:20 +0200 |
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