Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 1978:10606ee61107
do proper typecasting on malloc() and calloc() calls
to support build on Solaris 2.6 using Sun Pro SC4.0 (C++ 4.1) compiler.
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Mon, 20 Mar 2006 08:46:29 +0100 |
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