mergetools / gvimdiffon commit stash: keep untracked files intact in stash -k (e0e7f99)
   1. "$MERGE_TOOLS_DIR/vimdiff"