mergetools / gvimdiff2on commit t/helper: merge test-subprocess into test-tool (112edd6)
   1. "$MERGE_TOOLS_DIR/vimdiff"