Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue612.out @ 4820:9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 16:01:07 -0500 |
parents | |
children |
line wrap: on
line source
adding src/a.c copying src/a.c to source/a.c removing src/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