mergetools / gvimdiffon commit Merge branch 'us/printf-not-echo' (cf30bfb)
   1. "$MERGE_TOOLS_DIR/vimdiff"