Mercurial > hg
view tests/test-conflict @ 2329:90368f89340a
notify: add debug output. do not fail if no config file.
use --debug to see debug output.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sat, 20 May 2006 12:52:02 -0700 |
parents | e506c14382fd |
children | 46280c004f22 |
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