Anytime I do a merge I prefer to use -v so I can visually/casually confirm the list of files as they\'re being processed. Lately (now using Mercurial 5.5.1),
-v