Merge branch 'jk/rev-list-has-no-notes'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"