view tests/test-issue612.out @ 8230:ec98f35e3e16

fancyopts: add copyright and license header
author Martin Geisler <mg@lazybytes.net>
date Sun, 26 Apr 2009 01:56:52 +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