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

From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Mar 2, 2011, 00:28 UTC
Message-ID: <87hbbmqsbt.fsf@fox.patthoyts.tk>
In-Reply-To: <7voc5wk5wl.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

Show 20 quoted lines

>Sebastian Schuberth <sschuberth@gmail.com> writes:
>
>> 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.

Where is this branch?

-- 
Pat Thoyts                            http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD