Mercurial > hg > mercurial-crew-with-dirclash
diff hgmerge @ 3301: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 | 6a03cff2b0f5 |
| children | e4480f2b61e9 |