view tests/test-issue612.out @ 6482:529d7887ecfe

test-mactext: simplify test, coverage is ensured by win32text tests
author Patrick Mezard <pmezard@gmail.com>
date Sat, 05 Apr 2008 19:03:45 +0200
parents 4b0c9c674707
children 368a4ec603cc
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
created new head
? 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