mergetools / gvimdiff2on commit update-index: add --test-untracked-cache (eaab83d)
   1. "$MERGE_TOOLS_DIR/vimdiff"