mergetools / gvimdiff3on commit Merge branch 'jk/prompt-stash-could-be-packed' into maint (8ec959f)
   1. "$MERGE_TOOLS_DIR/vimdiff"