view tests/test-merge8.out @ 9462:1f54b1b7122f

test-keyword: run kwdemo before setting up [keyword] files kwdemo would pass the test without uisetup otherwise. Also no need to specify --default option.
author Christian Ebert <blacktrash@gmx.net>
date Thu, 10 Sep 2009 23:15:37 +0200
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