Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge5.out @ 2962:882e703eaa94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate.py: when comparing mtimes, use only the integer part. Python 2.5 can return timestamps with subsecond resolution.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 20 Aug 2006 01:13:11 -0300
parents 49988d9f0758
children 41989e55fa37
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2038
diff changeset
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
2 removing b
2830
49988d9f0758 Merge with crew, fix most tests
Matt Mackall <mpm@selenic.com>
parents: 2175
diff changeset
3 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes