mergetools / vimdiff3on commit stash: require a clean index to apply (ed178ef)
   1. "$MERGE_TOOLS_DIR/vimdiff"