Mercurial > hg > mercurial-crew-with-dirclash
view hgext/__init__.py @ 4696:59b8f9361545
tests: add merge test for changeset 9fe267f77f56
When all the files in a directory are moved somewhere else, and new
files are added in changesets of the local branch, a subsequent pull
and merge shouldn't rename the locally added files too.
| author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
|---|---|
| date | Sat, 23 Jun 2007 22:43:46 -0500 |
| parents | 7d439981bec4 |
| children |