Mercurial > hg
annotate tkmerge @ 206:3295b6b508de
hg: don't complain about missing repo with no args
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg: don't complain about missing repo with no args
manifest hash: d8172c0b583d6f2ff60cf49e74c1247de8d9d673
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCnVmeywK+sNU5EO8RAj79AJ4wN1SwC8+e1amxv+EAd6VKhpXXYgCeIPDK
iVX9Z0Ix8DiC3p8fquyhFwM=
=c6EH
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 31 May 2005 22:45:50 -0800 |
parents | 9117c6561b0b |
children |
rev | line source |
---|---|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1 merge $1 $3 $2 || tkdiff -conflict $1 -o $1 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
2 |