tests/test-merge10.out
author Sune Foldager <cryo@cyanite.org>
Mon, 11 May 2009 07:55:13 +0200
changeset 8344 873429914ec5
parent 6512 368a4ec603cc
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
url: fix bug in passwordmgr related to auth configuration Usernames given as part of the URL would be ignored. This bug was introduced in 89c80c3dc5842d609e9ba13f08fd2cf7f127c25a

updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging testdir/subdir/a and testdir/a to testdir/subdir/a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M testdir/subdir/a
diff -r d02b3fc32762 testdir/subdir/a
--- a/testdir/subdir/a
+++ b/testdir/subdir/a
@@ -1,1 +1,1 @@
-a
+alpha