Mercurial > hg

annotate tests/test-merge2.out @ 5081:ea7b982b6c08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove trailing spaces
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 07 Aug 2007 10:24:33 +0200
parents b2ae81a7df29
children 4b0c9c674707
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: 925
diff changeset
1 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
2 0 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
3 adding b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
4 0 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
5 adding b