[PATCH 3 of 3] help: describe new cross-branch behavior in update help text, plus cleanups

[Gilles Moris]

On Friday 30 October 2009 03:59:53 am Stuart W Marks wrote:
> +    The following rules apply when the working directory contains
> +    uncommitted changes:
> +    
> +    1. With neither the -c/--check nor the -C/--clean option, uncommitted
> +    changes are merged into the requested revision, and the merged result
> +    is left uncommitted. Updating and merging will occur only if the
> +    requested revision is an ancestor or descendant of the parent
> +    revision. Otherwise, the uncommitted changes are preserved
> +    and the working directory is not updated.
> +    
> +    2. With the -c/--check option, uncommitted changes are preserved and
> +    the working directory is not updated.

Just a (very) minor comment.
The fact that uncommitted changes are preserved is more a side effect that the 
update fails.
So for 1. and 2., I would rather say:
"... the update of the working directory fails with uncommitted changes 
preserved."
But other native english speakers may have another idea.

Other than that, I am perfectly OK with this patch series.

Regards.
Gilles.