mergetools / gvimdiff3on commit stash: clean untracked files before reset (bbffd87)
   1. "$MERGE_TOOLS_DIR/vimdiff"