mergetools / gvimdiffon commit Merge branch 'dl/use-sq-from-test-lib' (d693345)
   1. "$MERGE_TOOLS_DIR/vimdiff"