Re: [PATCH] Copy mergetool bc3 as bc4

2014-10-21 Thread David Aguilar
On Mon, Oct 20, 2014 at 11:40:23AM -0700, Junio C Hamano wrote: Sebastian Schuberth sschube...@gmail.com writes: Perhaps something like this, so that existing users can still use bc3 and other people can use bc if it bothers them that they have to say 3 when the backend driver works with

Re: [PATCH] Copy mergetool bc3 as bc4

2014-10-21 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: Otherwise, this patch looks like the right way to go ~ it makes bc available and keeps compatibility for bc3. OK, thanks. Here is what I'll queue. -- 8 -- From: Junio C Hamano gits...@pobox.com Date: Mon, 20 Oct 2014 15:49:36 -0700 Subject: [PATCH]

[PATCH] Copy mergetool bc3 as bc4

2014-10-20 Thread Olivier Croquette
Beyond compare 4 is out since september 2014. The CLI interface doesn't seem to have changed compared to the version 3. Signed-off-by: Olivier Croquette ocroque...@free.fr --- mergetools/bc4 | 25 + 1 files changed, 25 insertions(+), 0 deletions(-) create mode 100644

Re: [PATCH] Copy mergetool bc3 as bc4

2014-10-20 Thread Junio C Hamano
Olivier Croquette ocroque...@free.fr writes: Beyond compare 4 is out since september 2014. The CLI interface doesn't seem to have changed compared to the version 3. Hmph, if this is identical to mergetools/bc3, why is the patch even needed? Do we auto-detect something and try to use bc4 which

Re: [PATCH] Copy mergetool bc3 as bc4

2014-10-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Olivier Croquette ocroque...@free.fr writes: Beyond compare 4 is out since september 2014. The CLI interface doesn't seem to have changed compared to the version 3. Hmph, if this is identical to mergetools/bc3, why is the patch even needed? Do we

Re: [PATCH] Copy mergetool bc3 as bc4

2014-10-20 Thread Sebastian Schuberth
On 20.10.2014 19:32, Junio C Hamano wrote: Beyond compare 4 is out since september 2014. The CLI interface doesn't seem to have changed compared to the version 3. Hmph, if this is identical to mergetools/bc3, why is the patch even needed? Do we auto-detect something and try to use bc4 which

Re: [PATCH] Copy mergetool bc3 as bc4

2014-10-20 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: Perhaps something like this, so that existing users can still use bc3 and other people can use bc if it bothers them that they have to say 3 when the backend driver works with both 3 and 4? That indeed sounds like the best approach. ---

Re: [PATCH] Copy mergetool bc3 as bc4

2014-10-20 Thread Olivier Croquette
On 20 Oct 2014, at 19:32, Junio C Hamano gits...@pobox.com wrote: Perhaps something like this, so that existing users can still use bc3 and other people can use bc if it bothers them that they have to say 3 when the backend driver works with both 3 and 4? Thanks for the quick and great