Mercurial > hg

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2493a478f395
children 4b0c9c674707
line wrap: on
line source

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
? src/a.o
merging src/a.c and source/a.c
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M source/a.c
R src/a.c
? source/a.o