mergetools / gvimdiff3on commit Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maint (ae8daba)
   1. "$MERGE_TOOLS_DIR/vimdiff"