tests/test-issue612.out
author Matt Mackall <mpm@selenic.com>
Fri, 07 Dec 2007 02:29:55 -0600
changeset 5610 2493a478f395
parent 4819 9797124581c9
child 6336 4b0c9c674707
permissions -rw-r--r--
copy: handle rename internally - add rename parameter - don't collect copied list - report "moving" rather than "copying" - remove renamed files - don't return copied list - simplify callers

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
? src/a.o
merging src/a.c and 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