diff mercurial/merge.py @ 9718:fe1b19bfe75b

help: describe new cross-branch behavior in update help text, plus cleanups
author Stuart W Marks <smarks@smarks.org>
date Thu, 05 Nov 2009 10:59:33 +0100
parents 68a1b9d0663e
children 1ee085511b89
line wrap: on
line diff