diff options
Diffstat (limited to 'pkg/gui/controllers/merge_conflicts_controller.go')
| -rw-r--r-- | pkg/gui/controllers/merge_conflicts_controller.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/controllers/merge_conflicts_controller.go b/pkg/gui/controllers/merge_conflicts_controller.go index c90ada92e..38419e37a 100644 --- a/pkg/gui/controllers/merge_conflicts_controller.go +++ b/pkg/gui/controllers/merge_conflicts_controller.go @@ -215,7 +215,7 @@ func (self *MergeConflictsController) HandleUndo() error { } self.c.LogAction("Restoring file to previous state") - self.c.LogCommand("Undoing last conflict resolution", false) + self.c.LogCommand(self.c.Tr.Actions.LogHandleUndo, false) if err := os.WriteFile(state.GetPath(), []byte(state.GetContent()), 0o644); err != nil { return err } |