Mercurial > hg > pyhgsh
view tests/test-conflict @ 2287:3f18d1eea370
Update debugindexdot to work with RevlogNG.
author | Samuel Masham <samuel.masham@gmail.com> |
---|---|
date | Mon, 15 May 2006 08:53:32 -0700 |
parents | e506c14382fd |
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" HGMERGE=merge; export HGMERGE hg merge 1 hg id egrep -v ">>>|<<<" a hg status