Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 2083:345107e167a0
merge 0.8.1 with revlogng
author | Chris Mason <mason@suse.com> |
---|---|
date | Sat, 08 Apr 2006 20:10:46 -0400 |
parents | 7544700fd931 |
children | e506c14382fd |
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 up -m 1 hg id egrep -v ">>>|<<<" a hg status