Mercurial > hg-stable
view tests/test-merge4.out @ 5610:2493a478f395
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
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 07 Dec 2007 02:29:55 -0600 |
| parents | b2ae81a7df29 |
| children | 4b0c9c674707 |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)