Mercurial > hg

view tests/test-merge8.out @ 4384:caaba589d9c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use patch.patch() when checking for patch availability. The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.
author Patrick Mezard <pmezard@gmail.com>
date Sat, 28 Apr 2007 11:53:36 +0200
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