mergetools / vimdiff2on commit Merge branch 'je/pager-do-not-recurse' into maint (e293c56)
   1. "$MERGE_TOOLS_DIR/vimdiff"