Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 2252:ba7afc7dd901
Added tag 0.9 for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 10 May 2006 16:55:55 -0500 |
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