Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 618:4051b78c53c7
Handle unrecognised options correctly.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 837a023781a0228e5791e8e278129d2d54d13f99
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Handle unrecognised options correctly.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 04 Jul 2005 12:39:35 -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