Fix typos

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)

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])
 }

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()