Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 1820:7e10518b2b9e
Really fix bash_completion on Solaris. Maybe. Hopefully.
Use substr instead of sub.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 01 Mar 2006 14:52:28 +0100 |
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