diff options
| author | jiepeng <jiepengthegreat@126.com> | 2022-09-13 18:18:22 +0800 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-09-17 15:10:41 -0700 |
| commit | bc8050d8acb9cc162e03d3d93e1328feebcd4cb4 (patch) | |
| tree | 83504234014107304b8a5d8117dee8b950add821 | |
| parent | b8900baf1ada72c24e58c487122c21e80858f52a (diff) | |
typo
| -rw-r--r-- | pkg/gui/controllers/merge_conflicts_controller.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/gui/controllers/merge_conflicts_controller.go b/pkg/gui/controllers/merge_conflicts_controller.go index 14ab748b1..40824099e 100644 --- a/pkg/gui/controllers/merge_conflicts_controller.go +++ b/pkg/gui/controllers/merge_conflicts_controller.go @@ -1,7 +1,6 @@ package controllers import ( - "io/ioutil" "os" "github.com/jesseduffield/gocui" @@ -193,7 +192,7 @@ func (self *MergeConflictsController) HandleUndo() error { self.c.LogAction("Restoring file to previous state") 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 } |