Mercurial > hg > mercurial-crew-with-dirclash
comparison contrib/zsh_completion @ 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 | 2d3379c598c1 |
children | e21644bbf01e |
comparison
equal
deleted
inserted
replaced
4695:c3da7b6cc975 | 4696:59b8f9361545 |
---|