From 9ce2e9fdaa1dd5e1f168638f7b9823716b9ebd74 Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Fri, 3 Sep 2021 23:14:28 +0200 Subject: [PATCH] add #2151 --- supermerge.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/supermerge.sh b/supermerge.sh index 11f9d0f5693c..8895eeb00778 100644 --- a/supermerge.sh +++ b/supermerge.sh @@ -59,10 +59,11 @@ rebase_n_merge_pr 2393 rebase_n_merge_pr 2154 rebase_n_merge_pr 2043 rebase_n_merge_pr 2080 -rebase_n_merge_pr 2310 -X theirs +rebase_n_merge_pr 2310 rebase_n_merge_pr 2138 rebase_n_merge_pr 2139 rebase_n_merge_pr 2149 +rebase_n_merge_pr 2151 rebase_n_merge_pr 2157 rebase_n_merge_pr 2198 rebase_n_merge_pr 2202