diff mercurial/merge.py @ 7037:e3f9feb9ab7e

update: mention null revision in help text
author Martin Geisler <mg@daimi.au.dk>
date Wed, 17 Sep 2008 10:24:30 +0200
parents 1d38f3605b20
children 11229144aa01
line wrap: on
line diff