From: Junio C Hamano Date: Sun, 27 Feb 2011 09:12:40 GMT Subject: Re: [PATCH 0/3] Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23) Message-ID: <7v39n96dtj.fsf@alter.siamese.dyndns.org> In-Reply-To: <4D68DAC4.9060100@gmail.com> Sebastian Schuberth writes: > Sebastian Schuberth (3): > mergetool--lib: Sort tools alphabetically for easier lookup > mergetool--lib: Add Beyond Compare 3 as a tool > mergetool--lib: Add the proper executable name for ECMerge > > 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 | 250 > +++++++++++++++++--------------- > 6 files changed, 198 insertions(+), 171 deletions(-) Ohh, somebody line-wrapped your message. I've dropped git-gui/ bits from the series, and queued the remainder as ss/mergetool-lib branch. I also forked git-gui and queued the git-gui/ bits there to create ss/git-gui-mergetool branch. When the ss/mergetool-lib branch gets ready to be merged to 'next', I'll ask Pat to keep an eye on the ss/git-gui-mergetool branch and we will coordinate the merge of these two topics to our respective 'master' branches to make sure that the git-core side graduates first and followed by git-gui side. Thanks.