summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorLibravatar Michal Privoznik <mprivozn@redhat.com>2013-01-16 08:51:58 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-16 09:41:18 -0800
commit07924d4d50e5304fb53eb60aaba8aef31d4c4e5e (patch)
tree10760d4a006cead5202c480677f94ffac652f667 /mergetools/vimdiff
parentconfig: Introduce diff.algorithm variable (diff)
downloadtgif-07924d4d50e5304fb53eb60aaba8aef31d4c4e5e.tar.xz
diff: Introduce --diff-algorithm command line option
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`. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions