Mercurial > hg > pyhgsh

comparison tests/test-conflict @ 547:4fc63e22b1fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 1742d7ba2093dc643b57e45167cb2d794212cbb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPCQywK+sNU5EO8RAkr0AJ9qut/31lCLQ/xY3FWaF3c21RhS7wCfW1eV 3WexPDsJldMAr3V5vc9eowA= =pJYu -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 30 Jun 2005 23:28:16 -0800
parents ee4c80d294e5 3d4d5f2aba9a
children eb46971fc57f
comparison
equal deleted inserted replaced
540:53872e2be33a 547:4fc63e22b1fe
1 #!/bin/bash 1 #!/bin/sh
2 2
3 set -x 3 set -x
4 hg init 4 hg init
5 echo "nothing" > a 5 echo "nothing" > a
6 hg add a 6 hg add a