Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 3200:e67c22bc8bba
merge: use repo.parents and parent contexts in update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 29 Sep 2006 16:39:38 -0500 |
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