From: Charles Bailey Date: Thu, 18 Nov 2010 11:27:57 GMT Subject: Re: [PATCH 0/3] Improvements to mergetool-lib Message-ID: <4CE50DBC.3090409@hashpling.org> In-Reply-To: <4CE50290.90600@gmail.com> On 18/11/2010 10:40, Sebastian Schuberth wrote: > This small series adds Beyond Compare 3 as a diff / merge tool > and performs some minor improvements. > > 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 | 243 +++++++++++++++++--------------- > 6 files changed, 195 insertions(+), 167 deletions(-) > I'm not an ecmerge or Beyond Compare user. The reordering of tools makes for a bit of a messy diff but I think it makes sense. This series looks good to me. Has it been well tested? Charles.