Re: [PATCH 0/2 v2] Adding Beyond Compare as a merge tool

From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Feb 28, 2011, 07:02 UTC
Message-ID: <AANLkTi=ZMt8-Xt8fX2hawJPQnSc8OCUqjLoQ04R5rHtZ@mail.gmail.com>
In-Reply-To: <7voc5wk5wl.fsf@alter.siamese.dyndns.org>

On Mon, Feb 28, 2011 at 07:52, Junio C Hamano <gitster@pobox.com> wrote:

Show 14 quoted lines

>> Sebastian Schuberth (2):
>>   mergetool--lib: Sort tools alphabetically for easier lookup
>>   mergetool--lib: Add Beyond Compare 3 as a tool
>>
>>  Documentation/git-difftool.txt         |    4 +-
>>  Documentation/git-mergetool.txt        |    4 +-
>>  Documentation/merge-config.txt         |    8 +-
>>  contrib/completion/git-completion.bash |    2 +-
>>  git-gui/lib/mergetool.tcl              |  101 +++++++------
>>  git-mergetool--lib.sh                  |  247 +++++++++++++++++---------------
>>  6 files changed, 195 insertions(+), 171 deletions(-)
>
> Hmm, I really would have liked if you took the hint and separated git-gui
> bits into separate patches.

Sorry, I somehow thought this would not be necessary as there were no changes to git-gui/lib/mergetool.tcl since v1, but that was a a dumb thought. I'll separate the patches if I have incremental updates.

-- 
Sebastian Schuberth