tests/test-issue612.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 18 Jan 2010 22:59:32 +0100
changeset 10260 fe699ca08a45
parent 6512 368a4ec603cc
permissions -rw-r--r--
templatekw: fix extras, manifest and showlist args (issue1989) Removing the explicit parameters from keywords signature is easier than copying and reproducing the original argument list.

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
? src/a.o
merging src/a.c and source/a.c to 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