Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 2214:6c6c0e5595a2
make test-confused-revert check working dir with two parents.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 05 May 2006 10:45:08 -0700 |
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