From 729ccebedb2145135a7237b6feee11fa6aa1fe14 Mon Sep 17 00:00:00 2001 From: "Mike JS. Choi" Date: Thu, 31 May 2018 21:27:18 -0500 Subject: [PATCH] Fix typos --- conflict/command_test.go | 2 +- editor/content_test.go | 2 +- prompt.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conflict/command_test.go b/conflict/command_test.go index 45a5e3d..939271f 100644 --- a/conflict/command_test.go +++ b/conflict/command_test.go @@ -35,7 +35,7 @@ func TestHelperProcess(t *testing.T) { os.Exit(1) } - // TopLevelPath arguements + // TopLevelPath arguments if args == "rev-parse,--show-toplevel" { fmt.Fprintf(os.Stdout, "testdata") os.Exit(0) diff --git a/editor/content_test.go b/editor/content_test.go index b2de76e..3a767e7 100644 --- a/editor/content_test.go +++ b/editor/content_test.go @@ -24,7 +24,7 @@ func TestCreateContentFromFile(t *testing.T) { testhelper.Ok(t, err) c, err := contentFromFile(f.Name()) - + testhelper.Ok(t, err) testhelper.Equals(t, "foo\n", c.c[0]) testhelper.Equals(t, "bar", c.c[1]) } diff --git a/prompt.go b/prompt.go index 10aca71..f05f1b6 100644 --- a/prompt.go +++ b/prompt.go @@ -19,7 +19,7 @@ var ErrUnknownCmd = errors.New("This person doesn't know whats going on") var ErrOpenEditor = errors.New("Screen is tainted after opening vim") // PrintPrompt prints the promptString on the bottom left corner of the screen -// Note that the prompt is composed of two seperate views, +// Note that the prompt is composed of two separate views, // one that displays just the promptString, and another that takes input from the user func PrintPrompt(g *gocui.Gui) { promptString := binding.Summary()