Mercurial > hg

view tests/test-merge8.out @ 7731:737f274d1915

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-tools Some tests of merge-tools configuration and selection, mostly excercising filemerge.py
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 25 Jan 2009 21:20:11 +0100
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line source

updating working directory
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)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved