Mercurial > hg > pyhgsh

diff 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
line wrap: on
line diff
--- a/tests/test-merge3.out	Sat Feb 18 16:31:02 2006 +0100
+++ b/tests/test-merge3.out	Sat Feb 18 07:37:59 2006 -0800
@@ -1,3 +1,2 @@
 removing b
-b never committed!
 nothing changed