Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 777:8a61f25414b5
Wrap RSS description in CDATA
Problem spotted by Ollivier Robert
author | mpm@selenic.com |
---|---|
date | Wed, 27 Jul 2005 07:35:36 -0800 |
parents | 7e4843b7efd2 |
children | ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4 |
line wrap: on
line source
#!/bin/sh set -x 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" export HGMERGE=merge hg up -m 1 hg id grep -Ev ">>>|<<<" a hg status