merge vs pull

[Kevin Smith]

Jari Aalto wrote:
> If pull doesn't signal anything, the user is left under assumption
> that everything went ok. Having to supply --verbose during pull in
> order to get notification about conflicts is path to confusion.
> 
> Option --verbose can print MORE information if supplied.

Right, that's what I meant. Default would say "there were conflicts", 
and --verbose might provide a list of all the files that now contain 
conflict markers.

Kevin