Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 729:626aa658e2a9
Turn make_filename into make_file, which returns a file handle.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 20 Jul 2005 02:48:16 -0800 |
parents | eb46971fc57f |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh set -x hg init echo "nothing" > a hg add a hg commit -t ancestor -u test -d "0 0" echo "something" > a hg commit -t branch1 -u test -d "0 0" hg co 0 echo "something else" > a hg commit -t branch2 -u test -d "0 0" export HGMERGE=merge hg up -m 1 hg id grep -Ev ">>>|<<<" a hg status