Fix bug when accepting a merge

This commit is contained in:
friebetill 2023-02-04 15:05:03 +08:00
parent 60fd218e7b
commit 2bd2e46aa2

View file

@ -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({