Merge branch 'jk/daemon-path-ok-check-truncation'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"