Mercurial > hg > pyhgsh
view tests/test-conflict @ 2298:4be9a79b49b1
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 17 May 2006 13:21:36 -0500 |
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