view tests/test-issue619.out @ 5823:2a66138c5e7e

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>".
author Christian Ebert <blacktrash@gmx.net>
date Wed, 09 Jan 2008 05:18:50 +0100
parents 8808ea7da86b
children cdc458b12f0f
line wrap: on
line source

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
done