[PATCH 1 of 1] merge: Add an option to select conflict resolution tool

[Isaac Jurado]

# HG changeset patch
# User Isaac Jurado <diptongo at gmail.com>
# Date 1267967340 -3600
# Node ID 819f40e87e8410dec0ebefbd58031c717751ed99
# Parent  b98b6a7363ae69e0538bfc605d3e056a7b444d79
merge: Add an option to select conflict resolution tool

diff -r b98b6a7363ae -r 819f40e87e84 mercurial/commands.py
--- a/mercurial/commands.py	Sat Mar 06 13:29:54 2010 +0100
+++ b/mercurial/commands.py	Sun Mar 07 14:09:00 2010 +0100
@@ -2210,6 +2210,9 @@
     explicit revision with which to merge with must be provided.
     """
 
+    if opts.get('internal'):
+        ui.setconfig("ui", "merge", "internal:" + opts.get('internal'))
+
     if opts.get('rev') and node:
         raise util.Abort(_("please specify just one revision"))
     if not node:
@@ -3687,8 +3690,9 @@
          [('f', 'force', None, _('force a merge with outstanding changes')),
           ('r', 'rev', '', _('revision to merge')),
           ('P', 'preview', None,
-           _('review revisions to merge (no merge is performed)'))],
-         _('[-P] [-f] [[-r] REV]')),
+           _('review revisions to merge (no merge is performed)')),
+          ('i', 'internal', '', _('Select internal merge tool for conflict resolution'))],
+         _('[-P] [-f] [-i {prompt|local|other|fail}] [[-r] REV]')),
     "outgoing|out":
         (outgoing,
          [('f', 'force', None,