From: Junio C Hamano Date: Wed, 02 Mar 2011 04:26:18 GMT Subject: Re: [PATCH 0/2 v2] Adding Beyond Compare as a merge tool Message-ID: <7vhbbmf8r9.fsf@alter.siamese.dyndns.org> In-Reply-To: <87hbbmqsbt.fsf@fox.patthoyts.tk> Pat Thoyts writes: > Junio C Hamano writes: > >>Sebastian Schuberth 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? $ git log --oneline --first-parent master..pu Look for the commit that merge ss/git-gui-mergetool and pick its second parent, which is ffe6dc0 (mergetool--lib: Add Beyond Compare 3 as a tool, 2011-02-27). Thanks.