Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 1780:8a1f2eae2832
Merge with jeffpc
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 21 Feb 2006 17:36:27 -0600 |
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