Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"