view tests/test-issue612.out @ 6208:c88b9e597588

tests: add --keep-tmp to run-tests.py to debug test environment

When set, you can find the working dir of the test run as a
uniquely named subdirectory of --tmpdir so you can inspect
it.

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