Mercurial > hg
comparison mercurial/bundlerepo.py @ 3252:ae85272b59a4
merge: copy fixes and tests
Fix up "already seen" logic
Fix merge action in remote copy case
Add status message
Add lots of merge+copy/move test cases
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 06 Oct 2006 16:55:11 -0500 |
| parents | 386f04d6ecb3 |
| children | b19360aa21e9 |
comparison
equal
deleted
inserted
replaced
| 3251:c93ce7f10f85 | 3252:ae85272b59a4 |
|---|