From: Catalin Marinas <catalin.marinas@arm.com>
Date: Thu, 9 Apr 2009 20:40:58 +0000 (+0300)
Subject: Add mergetool support to the classic StGit infrastructure
X-Git-Tag: v0.15-rc1~32
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/b993d23f49af71ded6b0eaeb19ccf25b6bec4432?hp=b993d23f49af71ded6b0eaeb19ccf25b6bec4432

Add mergetool support to the classic StGit infrastructure

Since Git already has a tool for interactively solving conflicts which
is highly customisable, there is no need to duplicate this feature via
the i3merge and i2merge configuration options. The user-visible change
is that now mergetool is invoked rather than the previously customised
interactive merging tool.

The stgit.keeporig option is no longer available to be more consistent
with the Git behaviour.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Acked-by: Karl Hasselström <kha@treskal.com>
---