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