mergetools / gvimdiff2on commit Merge branch 'wk/doc-in-linux-3.x-era' (0d07e98)
   1. "$MERGE_TOOLS_DIR/vimdiff"