go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-09 13:47:11 +02:00
Code Issues Releases Activity

typo

Browse Source
This commit is contained in:
jiepeng 2022-09-13 18:18:22 +08:00 committed by Jesse Duffield
parent b8900baf1a
commit bc8050d8ac
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/gui/controllers/merge_conflicts_controller.go
View File

@ -1,7 +1,6 @@
package controllers package controllers
import ( import (
"io/ioutil"
"os" "os"
"github.com/jesseduffield/gocui" "github.com/jesseduffield/gocui"
@ -193,7 +192,7 @@ func (self *MergeConflictsController) HandleUndo() error {
self.c.LogAction("Restoring file to previous state") self.c.LogAction("Restoring file to previous state")
self.c.LogCommand("Undoing last conflict resolution", false) self.c.LogCommand("Undoing last conflict resolution", false)
if err := ioutil.os(state.GetPath(), []byte(state.GetContent()), 0o644); err != nil { if err := os.WriteFile(state.GetPath(), []byte(state.GetContent()), 0o644); err != nil {
return err return err
} }