Mercurial > hg-stable

view tests/test-merge10.out @ 10918:1d8a13bb42ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add +x to test-update-renames, removed by the merge on 24ed7a541f23
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 15 Apr 2010 15:34:27 +0200
parents f2618cacb485
children
line wrap: on
line source

updating to branch default
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 f7459795031e testdir/subdir/a
--- a/testdir/subdir/a
+++ b/testdir/subdir/a
@@ -1,1 +1,1 @@
-a
+alpha