Re: [PATCH 3/3] diff: Introduce --diff-algorithm command line option

2013-01-14 Thread Junio C Hamano
Junio C Hamano writes: > Michal Privoznik writes: > ... >> diff --git a/merge-recursive.c b/merge-recursive.c >> index d882060..53d8feb 100644 >> --- a/merge-recursive.c >> +++ b/merge-recursive.c >> @@ -2068,6 +2068,12 @@ int parse_merge_opt(struct merge_options *o, const >> char *s) >>

Re: [PATCH 3/3] diff: Introduce --diff-algorithm command line option

2013-01-14 Thread Junio C Hamano
Michal Privoznik writes: > Since command line options have higher priority than config file > variables and taking previous commit into account, we need a way > how to specify myers algorithm on command line. Yes. We cannot stop at [2/3] without this patch. > However, > inventing `--myers` is

[PATCH 3/3] diff: Introduce --diff-algorithm command line option

2013-01-12 Thread Michal Privoznik
Since command line options have higher priority than config file variables and taking previous commit into account, we need a way how to specify myers algorithm on command line. However, inventing `--myers` is not the right answer. We need far more general option, and that is `--diff-algorithm`. Th