mergetools / gvimdiff2on commit Merge branch 'jk/show-branch-lift-name-len-limit' into maint (93abd17)
   1. "$MERGE_TOOLS_DIR/vimdiff"