mergetools / gvimdiff2on commit Merge branch 'ss/commit-squash-msg' into maint (ea7fefb)
   1. "$MERGE_TOOLS_DIR/vimdiff"