From b99371eec72981fe4b31ef6a0c19511ea405056e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 22 Sep 2021 08:05:50 +0200
Subject: [PATCH] build: replace ng-dev MergeConfig wiith PullRequestConfig

More info: https://github.com/angular/dev-infra/commit/c3f5729376048af3ce939a505e5389dba11ff7d2
---
 .ng-dev/config.ts                     | 2 +-
 .ng-dev/{merge.ts => pull-request.ts} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename .ng-dev/{merge.ts => pull-request.ts} (77%)

diff --git a/.ng-dev/config.ts b/.ng-dev/config.ts
index 1727da8f3df9..ea2fc26105a8 100644
--- a/.ng-dev/config.ts
+++ b/.ng-dev/config.ts
@@ -1,5 +1,5 @@
 export { commitMessage } from './commit-message';
 export { format } from './format';
 export { github } from './github';
-export { merge } from './merge';
+export { pullRequest } from './pull-request';
 export { release } from './release';
diff --git a/.ng-dev/merge.ts b/.ng-dev/pull-request.ts
similarity index 77%
rename from .ng-dev/merge.ts
rename to .ng-dev/pull-request.ts
index 12a4a1be1a30..cec9b1982164 100644
--- a/.ng-dev/merge.ts
+++ b/.ng-dev/pull-request.ts
@@ -1,10 +1,10 @@
-import { MergeConfig } from '@angular/dev-infra-private/ng-dev/pr/merge/config';
+import { PullRequestConfig } from '@angular/dev-infra-private/ng-dev/pr/config';
 
 /**
  * Configuration for the merge tool in `ng-dev`. This sets up the labels which
  * are respected by the merge script (e.g. the target labels).
  */
-export const merge: MergeConfig = {
+export const pullRequest: PullRequestConfig = {
   githubApiMerge: {
     default: 'rebase',
     labels: [{ pattern: 'squash commits', method: 'squash' }],