Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 2971:63c3a1921a67
Add ui.strict config item.
This turns off command matching by unambiguous prefix, and is a good
thing if you want to write future-proof scripts.
This fixes issue 314.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 21 Aug 2006 21:59:29 -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