Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 226:1536ccac47e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't bail on outstanding changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: don't bail on outstanding changes With multiple heads, we don't need to worry about the working dir's uncommitted changes at pull time manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy CysB458dNcFuB/vDFhgJr58= =gG+u -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 03 Jun 2005 12:45:04 -0800
parents 9117c6561b0b
children
line wrap: on
line source

merge $1 $3 $2 || tkdiff -conflict $1 -o $1