mergetools / gvimdiff2on commit Merge branch 'nd/index-pack-error-message' (0e8c092)
   1. "$MERGE_TOOLS_DIR/vimdiff"