tests/test-issue612.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 07 Sep 2007 16:14:51 +0200
changeset 5287 c6f932d3e0f6
parent 4820 9797124581c9
permissions -rw-r--r--
Don't decode unicode strings. This does not work with python2.3 and is probably not useful anyway with 2.4.

adding src/a.c
copying src/a.c to source/a.c
removing src/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