[MERGE] Fix bug 249919, added change example to diff help.

[Marius Kruger]

2009/7/6 Andrew Bennetts <andrew.bennetts at canonical.com>:
> I'm ambivalent about this.  It's a very useful command (I frequently use
> diff -c myself) and worth highlighting, but I think “bzr help diff” is
> already too long.  It already scrolls off a fullscreened terminal window on
> my laptop — and usually the parts I want to read are exactly the parts that
> scrolled offscreen (the options reference).

isn't that what --usage is for ?

> Perhaps we should split these
> examples into a “diff-examples” help topic, and just point to that from the
> help for the diff command?
>
> So I don't really object to this patch, but I'd be happier with creating a
> diff-examples topic.

We have the same scenario with `bzr log --help` which is a short book.
The way I understand it, the help policy at the moment doesn't really require
that it doesn't scroll off the terminal.
If we do want that, then we should probably document it in Hacking and
do a sweeping fix for all the offending helps.

regards
marius