mergetools / vimdiff2on commit Revert "stash: require a clean index to apply" (1937610)
   1. "$MERGE_TOOLS_DIR/vimdiff"