Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 2743:a31f0f2997e9
import: switch from application/x-patch to text/x-diff
christian ebert says his mailer was broken.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 31 Jul 2006 12:02:13 -0700 |
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