Merge branch 'wk/user-manual'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"