Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgrc.5.txt @ 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 | 09e8aecd8016 |
children | 8b55c0ba8048 |