Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 510:7f3fc8fd427e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More fiddling with uint32_t includes for extensions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More fiddling with uint32_t includes for extensions manifest hash: 1ad16a0262e9bd2769e32c13c7fd0c7b0cd7dde7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwS+/ywK+sNU5EO8RAhK1AKCtF/57nKCc1AU+l0sR74kHhY1NCwCfSvQK QQc5i8abuGkFpU5VUBJt5XQ= =H+CX -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 28 Jun 2005 03:08:47 -0800
parents 2fe8d66e3075
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh -x

hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
touch b
hg add b
rm b
hg commit -A -t"comment #1" -d "0 0" -u user