mergetools / vimdiff2on commit Documentation: "git reset <tree-ish> <pathspec>" takes a tree-ish, not tree-sh (debecc5)
   1. "$MERGE_TOOLS_DIR/vimdiff"