mergetools / gvimdiff2on commit Merge branch 'jk/create-branch-remove-unused-param' into maint (af8d6a9)
   1. "$MERGE_TOOLS_DIR/vimdiff"