mergetools / gvimdiff2on commit Revert "git stash: avoid data loss when "git stash save" kills a directory" (c1ebd90)
   1. "$MERGE_TOOLS_DIR/vimdiff"