Mercurial > hg
view tests/test-merge10.out @ 4894:be5dc5e3ab2d
hg parents: don't pass an OS-specific path to repo.filectx
The only reason to use the matcher code instead of calling util.canonpath
directly is to be able to use "path:canonical/path/to/file" patterns.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 17 Jul 2007 09:08:29 -0300 |
parents | 59b8f9361545 |
children | 3d1f9dcecdea |
line wrap: on
line source
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 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 -a +alpha