Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 948:ffb0665028f0
Merge with BOS
author | mpm@selenic.com |
---|---|
date | Fri, 19 Aug 2005 16:43:30 -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