[PATCH] resolve: updated help with info about merge tools

[Erik Zielke]

# HG changeset patch
# User Erik Zielke <ez at aragost.com>
# Date 1287140610 -7200
# Node ID 4c84dbd5e2f0640883c8a99713ef05d740a3ca17
# Parent  4bca87c29445a6fb67aebe7eaed3f89c171cae41
resolve: updated help with info about merge tools.

Updated command help for resolve to include information about how to
set merge tool.

Updated help for configuration file with a slightly more verbose
description of the internal merge tools.