view tests/test-merge8.out @ 11465:ace5bd98bee3 stable

heads: fix templating of headers again (issue2130) (tweaks and test by mpm)
author Simon Howkins <simonh@symbian.org>
date Thu, 24 Jun 2010 15:18:47 +0100
parents a3d73b3e1f8a
children
line wrap: on
line source

updating to branch default
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