mergetools / gvimdiffon commit Merge branch 'sf/putty-w-args' (d4592d7)
   1. "$MERGE_TOOLS_DIR/vimdiff"