Mercurial > hg
diff mercurial/util.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 | 7492b33bdd9f |
children | e96d2956eb4a |