Mercurial > hg
comparison mercurial/remoterepo.py @ 3295:72d1e521da77
merge: use contexts for manifestmerge
- take ma, backwards, and copy out of update
- move findcopies call inside manifestmerge
- pass repo rather than ui
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 09 Oct 2006 16:07:19 -0500 |
| parents | 345bac2bc4ec |
| children | 08800489257e |
comparison
equal
deleted
inserted
replaced
| 3294:a2d93b186a0e | 3295:72d1e521da77 |
|---|