tests/test-merge10.out
author Adrian Buehlmann <adrian at cadifra.com>
Wed, 14 May 2008 01:08:51 +0200
changeset 6614 944a292d522a
parent 6512 368a4ec603cc
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
doc/hgrc.5.txt: add anchors for sections Enables links into hgrc.5.html of the form: hgrc.5.html#section

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