Mercurial > hg
view tests/test-conflict @ 1929:85daa4e03b4c
Merging with crew.
author | Eric Hopper <hopper@omnifarious.org> |
---|---|
date | Mon, 06 Mar 2006 08:47:16 -0800 |
parents | c71420b186b0 |
children | 7544700fd931 |
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 egrep -v ">>>|<<<" a hg status