mergetools / gvimdiff2on commit Merge branch 'pw/completion-stash' into maint (47847c7)
   1. "$MERGE_TOOLS_DIR/vimdiff"