tests/test-issue612.out
author Matt Mackall <mpm@selenic.com>
Thu, 20 May 2010 12:21:35 -0500
changeset 11201 34023f2ca305
parent 6512 368a4ec603cc
permissions -rw-r--r--
Fix up rebase's handling of strip backups

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