Re: [PATCH] merge-recursive: fix parsing of "diff-algorithm" option

2013-09-26 Thread John Keeping
On Thu, Sep 26, 2013 at 01:47:20PM -0700, Jonathan Nieder wrote: > John Keeping wrote: > > > The "diff-algorithm" option to the recursive merge strategy takes the > > name of the algorithm as an option, but it uses strcmp on the option > > string to check if it starts with "diff-algorithm=", meani

Re: [PATCH] merge-recursive: fix parsing of "diff-algorithm" option

2013-09-26 Thread Jonathan Nieder
John Keeping wrote: > The "diff-algorithm" option to the recursive merge strategy takes the > name of the algorithm as an option, but it uses strcmp on the option > string to check if it starts with "diff-algorithm=", meaning that this > options cannot actually be used. > > Fix this by switching t

[PATCH] merge-recursive: fix parsing of "diff-algorithm" option

2013-09-26 Thread John Keeping
The "diff-algorithm" option to the recursive merge strategy takes the name of the algorithm as an option, but it uses strcmp on the option string to check if it starts with "diff-algorithm=", meaning that this options cannot actually be used. Fix this by switching to prefixcmp. At the same time,