mergetools / gvimdiffon commit Merge branch 'rs/sha1-array-test' (40e2d8d)
   1. "$MERGE_TOOLS_DIR/vimdiff"