mergetools / gvimdiffon commit Merge branch 'jc/clean-after-sanity-tests' (1840443)
   1. "$MERGE_TOOLS_DIR/vimdiff"