Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 463:ea93402b81b9
Added stdint.h include to fix build on Mac OS X Tiger [v10.4]
author | kyle@zeus.moffetthome.net |
---|---|
date | Fri, 24 Jun 2005 20:53:51 -0500 |
parents | ee4c80d294e5 |
children | 3d4d5f2aba9a 4fc63e22b1fe |
line wrap: on
line source
#!/bin/bash set -x hg init echo "nothing" > a hg add a hg commit -t ancestor -u test -d "0 0" echo "something" > a hg commit -t branch1 -u test -d "0 0" hg co 0 echo "something else" > a hg commit -t branch2 -u test -d "0 0" export HGMERGE=merge hg -d up -m 1 hg id grep -Ev ">>>|<<<" a hg status