mergetools / gvimdiffon commit Merge branch 'jk/stash-require-clean-index' into maint (351d06d)
   1. "$MERGE_TOOLS_DIR/vimdiff"