Merge branch 'nd/doc-new-command'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"