Comment 5 for bug 489915

I wholeheartedly support the comments in this bug description.
Improve it, and they will use it!
Setting up diff and merge is one of the first things a new user will do. Diff and merge operations are some of the most common interactions with the version control system.