Mercurial > hg > pyhgsh

annotate tests/test-merge3.out @ 1747:91c56c427171

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transitive copy/rename Add support for transitive copy or rename operations, e.g. hg rename a b ... (possibly edit b) hg rename b c hg commit ... by actually renaming "b" as "c" while recording a copy of "a" to "c" and a removal of "a".
author Robin Farine <robin.farine@terminus.org>
date Sat, 18 Feb 2006 07:37:59 -0800
parents 5a034646e472
children
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 removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
2 nothing changed