diff options
| author |  Alexander Gavrilov <angavrilov@gmail.com> | 2008-08-31 00:56:51 +0400 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-04 21:28:54 -0700 |
| commit | 7e30682ce042fdea1ff2c76226b17d9affe2f9bf (patch) | |
| tree | 0e544ab4c3a8fa07a96dc89637e9807ab7e2a0bb /lib/branch_create.tcl | |
| parent | git-gui: Support resolving conflicts via the diff context menu. (diff) | |
| download | tgif-7e30682ce042fdea1ff2c76226b17d9affe2f9bf.tar.xz | |
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>
Diffstat (limited to 'lib/branch_create.tcl')
0 files changed, 0 insertions, 0 deletions