comparison hgmerge @ 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 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3322:38be819a1225 3323:39fd6e82ea38