Mercurial > hg > pyhgsh

annotate tests/test-merge2.out @ 1996:4c70b10f0418

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't mention deprecated HGEDITOR variable in the help text of commit.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 24 Mar 2006 15:03:15 +0100
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
2 adding b