mergetools / gvimdiff2on commit test-lib: try harder to ensure a working jgit (abd0f28)
   1. "$MERGE_TOOLS_DIR/vimdiff"