Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-merge1 @ 3323:39fd6e82ea38
merge: pull user messages out to hg.py
- add _update for shadowing in clone
- add _showstats helper
- remove update parameter defaults
- move stats message and merge help messages
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 10 Oct 2006 03:39:44 -0500 |
| parents | 764688cf51e5 |
| children | c0b449154a90 |