Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 520:12b4b5612fe4
Add some TODO items
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add some TODO items
manifest hash: d188abf3c84b6ca98279b4bf053ce2844da83a03
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwvKyywK+sNU5EO8RAh9ZAJ9kYA0a/R7XynWqZGGr6JqUvXa37wCfd2a2
F9fCY85bSZgErvdrklP29bQ=
=FtlU
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 29 Jun 2005 11:12:50 -0800 |
parents | ee4c80d294e5 |
children | 3d4d5f2aba9a 4fc63e22b1fe |
line wrap: on
line source
#!/bin/bash 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 -d up -m 1 hg id grep -Ev ">>>|<<<" a hg status