Mercurial > hg

view tests/test-merge10.out @ 9510:8bd669948b2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: clarify license footers Mercurial is licensed under version 2 of the GPL
author Adrian Buehlmann <adrian@cadifra.com>
date Thu, 01 Oct 2009 11:40:53 +0200
parents 368a4ec603cc
children a3d73b3e1f8a
line wrap: on
line source

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