Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 4081:e6d26e71f049
merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 13 Feb 2007 10:25:45 -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