Mercurial > hg
view tests/test-merge10.out @ 10916:9c84395a338e stable
add documentation for revlog._prereadsize
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Thu, 15 Apr 2010 15:21:21 +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