# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1303815416 -7200
# Node ID 39920ce75842d9e08a1c733e4c8d78d87c7d2493
# Parent  b69471bdb6783cabe1d94003b0e32764e831ea5b# Parent  bcff4759d17dc7d6eec967b4ec2d7d12cde22cf7
merge default heads

diff -r b69471bdb678 -r 39920ce75842 tests/test-transplant.t
--- a/tests/test-transplant.t	Mon Apr 25 18:00:30 2011 +0800
+++ b/tests/test-transplant.t	Tue Apr 26 12:56:56 2011 +0200
@@ -397,12 +397,13 @@
   $ echo '[patch]' >> .hg/hgrc
   $ echo 'eol = crlf' >> .hg/hgrc
   $ python -c "file('b', 'wb').write('b\r\nb\r\n')"
-  $ hg ci -m addb
-  nothing changed
-  [1]
+  $ hg ci -Am addb
+  adding b
   $ hg transplant -s ../twin1 tip
+  searching for changes
+  warning: repository is unrelated
   applying 2e849d776c17
-  2e849d776c17 transplanted to 589cea8ba85b
+  2e849d776c17 transplanted to 8e65bebc063e
   $ cat b
   a\r (esc)
   b\r (esc)