From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Sat, 30 Aug 2008 20:56:51 +0000 (+0400)
Subject: git-gui: Support calling merge tools.
X-Git-Tag: v1.6.1-rc1~270^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7e30682ce042fdea1ff2c76226b17d9affe2f9bf?hp=7e30682ce042fdea1ff2c76226b17d9affe2f9bf

git-gui: Support calling merge tools.

Adds an item to the diff context menu in conflict mode,
which invokes a merge tool for the selected file. Tool
command-line handling code was ported from git-mergetool.

Automatic default tool selection and custom merge tools
are not supported. If merge.tool is not set, git-gui
defaults to meld.

This implementation uses a checkout-index hack in order
to retrieve all stages with autocrlf and filters properly
applied. It requires temporarily moving the original
conflict file out of the way.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---