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

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 28, 2011, 06:52 UTC
Message-ID: <7voc5wk5wl.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4D6A355C.3000805@gmail.com>

Sebastian Schuberth <sschuberth@gmail.com> writes:

Show 11 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.

I saw Tested-by from Chris, so I'll add that to what is queued on 'pu', ask Pat to keep an eye on the ss/git-gui-mergetool branch, and then merge my ss/mergetool--lib branch to 'master' during my next integration run.

IOW, no need for further actions from you on this topic for now unless you have incremental improvements on top.

Thanks.