Merge branch 'sf/putty-w-args'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"