tests/test-issue612.out
author Martin Geisler <mg@lazybytes.net>
Sat, 27 Jun 2009 12:31:41 +0200
changeset 8970 eac360045ba4
parent 6512 368a4ec603cc
permissions -rw-r--r--
convert: do not ask for translation of "%s %s"

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