Re: [PATCH v4] mergetools: add winmerge as a builtin tool

2015-05-20 Thread Junio C Hamano
David Aguilar writes: > On Wed, May 20, 2015 at 09:47:56AM +0200, Sebastian Schuberth wrote: >> On Wed, May 20, 2015 at 9:42 AM, David Aguilar wrote: >> >> > + OIFS=$IFS >> > + IFS=' >> > +' >> >> I guess this is just a formatting issue with the mail export as it should >> read >>

Re: [PATCH v4] mergetools: add winmerge as a builtin tool

2015-05-20 Thread Sebastian Schuberth
On Wed, May 20, 2015 at 9:42 AM, David Aguilar wrote: > + OIFS=$IFS > + IFS=' > +' I guess this is just a formatting issue with the mail export as it should read IFS=$'\n' Otherwise looks good to me. -- Sebastian Schuberth -- To unsubscribe from this list: send the line "unsubscr

[PATCH v4] mergetools: add winmerge as a builtin tool

2015-05-20 Thread David Aguilar
Add a winmerge scriptlet with the commands described in [1] so that users can use winmerge without needing to perform any additional configuration. [1] http://thread.gmane.org/gmane.comp.version-control.git/268631 Helped-by: Philip Oakley Helped-by: Johannes Schindelin Helped-by: Sebastian Schu