Mercurial > hg
view tests/test-conflict @ 912:302f83b85054
Minor tweak: os.STOPSIG -> os.WSTOPSIG. Pychecker spotted this one.
author | mark.williamson@cl.cam.ac.uk |
---|---|
date | Mon, 15 Aug 2005 11:46:41 -0800 |
parents | 0902ffece4b4 |
children | c71420b186b0 |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "0 0" echo "something" > a hg commit -m branch1 -d "0 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "0 0" HGMERGE=merge; export HGMERGE hg up -m 1 hg id grep -Ev ">>>|<<<" a hg status