Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/ui.py @ 3095:92a0c2200e41
merge: use context code to retrieve manifests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 22 Aug 2006 19:32:16 -0500 |
parents | 731f6b3d27c2 |
children | 494521a3f142 |