tests/test-issue612.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 13 Aug 2010 18:02:02 +0200
branchstable
changeset 11843 00f8e7837668
parent 6512 368a4ec603cc
permissions -rw-r--r--
rebase: recompute the set of skipped rev when using --continue (issue2330)

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