Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-committer.out @ 2548:0229ff95faec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents f1085d34d20d
children 8b55c0ba8048
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2104
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
1 changeset: 0:9426b370c206
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
2 tag: tip
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
3 user: My Name <myname@example.com>
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
4 date: Mon Jan 12 13:46:40 1970 +0000
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
5 summary: commit-1
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
6