Merge branch 'ax/line-log-range-merge-fix'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"