Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 942:7eb8cbcca7c4
Modify commands.walk to yield a 4-tuple.
The new element of the tuple indicates whether a name is an exact match
for one passed in on the command line.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu, 18 Aug 2005 13:58:32 -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