tests/test-merge8.out
author Christian Ebert <blacktrash@gmx.net>
Wed, 09 Jan 2008 05:18:50 +0100
changeset 5823 2a66138c5e7e
parent 4416 bb1800a7d7e1
child 6338 0750f11152fe
permissions -rw-r--r--
keyword: (bugfix) only set changenode for kwtemplater when committing kwexpand must always obtain changenode from filectx, otherwise current changenode is expanded in every file. Also fixes "hg cat <more than 1 file>".

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