Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8.out @ 4357:99c853a1408c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add mdiff.get_matching_blocks
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents 4787e2b0dd03
children bb1800a7d7e1
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 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
merging a and b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved