Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge5.out @ 4489:afa1f57ae484

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add sending date to notify message. When using SMTP, no date field was set into the message, which causes it to be displayed as being send on 1st january 1970 on most MUA.
author Mathieu Clabaut <mathieu.clabaut@gmail.com>
date Thu, 24 May 2007 16:32:38 +0200
parents fffc8a733bf9
children
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
3592
fffc8a733bf9 Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3580
diff changeset
3 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes