From 2bd2e46aa205df8f0fc3d517413ec5a01825b2c5 Mon Sep 17 00:00:00 2001 From: friebetill Date: Sat, 4 Feb 2023 15:05:03 +0800 Subject: [PATCH] Fix bug when accepting a merge --- src/components/action_line.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/action_line.ts b/src/components/action_line.ts index 93dd905..b45e4ed 100644 --- a/src/components/action_line.ts +++ b/src/components/action_line.ts @@ -73,7 +73,7 @@ export class ActionLine { } else if (hasPlusLines) { new ActionLineButton({ text: `Accept from ${this.file2.name}`, - onClick: (e) => this.acceptTopClick(e, this.difference), + onClick: (e) => this.acceptBottomClick(e, this.difference), }).build(actionLine) ActionLineDivider.build(actionLine) new ActionLineButton({