Mercurial > hg > pyhgsh
view tests/test-conflict @ 2385:5d895018ef42
The line used to ignore the setup file for win32 is a regexp but it was after a "syntax: glob"
author | Marco Barisione <marco@barisione.org> |
---|---|
date | Mon, 22 May 2006 16:47:40 +0200 |
parents | e506c14382fd |
children |
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