Mercurial > hg

diff hgmerge @ 273:4f8174389001

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: Fix bug where we overwrote local when local was newer -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: Fix bug where we overwrote local when local was newer Spotted by Arun Sharma manifest hash: b81acb971c6471d95748cd349590cc70e448dce3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpl9oywK+sNU5EO8RAtseAJ92EEMovbVy0J1rFuxcGvED066m+ACfaWYF Q1/PcvkuH9aIqwMNkMK+aPU= =61JM -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 07 Jun 2005 19:00:56 -0800
parents a2edb4481f19
children a69c3b2957d1
line wrap: on
line diff