Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: [PATCH] completion: git: update list of builtintools

Daniel Hahler wrote on Thu, Apr 09, 2015 at 23:57:53 +0200:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On 29.03.2015 07:49, Daniel Shahaf wrote:
> > On Fri, Mar 20, 2015 at 02:11:40AM +0100, Daniel Hahler wrote:
> >>    builtintools=(
> >> +    bc
> > 
> > I don't see bc in <https://github.com/git/git/tree/master/mergetools>,
> > is it a valid value?
> > 
> >> +    bc3
> > 
> 
> Yes, it is:
> 
>     * commit f13f9b0
>       Author: Junio C Hamano <gitster@xxxxxxxxx>
>       Date:   Mon Oct 20 15:49:36 2014 -0700
> 
>           mergetool: rename bc3 to bc
> 
>           Beyond Compare version 4 works the same way as version 3, so rename
>           the existing "bc3" adaptor to just "bc", while keeping "bc3" as a
>           backward compatible wrapper.

Thanks; pushed.

Daniel
Messages sorted by: Reverse Date, Date, Thread, Author