Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-simple-update.out @ 1664:4338e33c973b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Safer version of FileMerge merge
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Jan 2006 12:02:12 +1300
parents 5a034646e472
children 3053fc33f545
line wrap: on
line source

adding foo
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
pulling from ../branch
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
foo
bar
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo