view tests/test-issue612.out @ 8044:c1e2b7407dc3

purge: fix b777dd8f7836 (remove read-only files) - use try/except to avoid unnecessary work - edit only mode bits
author Patrick Mezard <pmezard@gmail.com>
date Sat, 11 Apr 2009 00:13:18 +0200
parents 368a4ec603cc
children
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 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