summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff3
diff options
context:
space:
mode:
authorLibravatar Felipe Gonçalves Assis <felipeg.assis@gmail.com>2016-02-17 01:15:26 -0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-17 10:20:52 -0800
commit1b47ad160b55f50a7a98c180e18d80f0f8f17a67 (patch)
tree196dcd66914dca5b4a8329a7d54b599680a7074c /mergetools/gvimdiff3
parentmerge-recursive: option to disable renames (diff)
downloadtgif-1b47ad160b55f50a7a98c180e18d80f0f8f17a67.tar.xz
merge-recursive: more consistent interface
Add strategy option find-renames, following git-diff interface. This makes the option rename-threshold redundant. Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/gvimdiff3')
0 files changed, 0 insertions, 0 deletions