tests/test-issue612.out
author Mads Kiilerich <mads@kiilerich.com>
Wed, 16 Jun 2010 17:43:35 +0200
changeset 11407 f5be44090ba8
parent 6512 368a4ec603cc
permissions -rw-r--r--
test-import: test git patch import with strip Tests revision 0429d0d49f92

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