Merge pull request #1942 from rsteube/git-mergeonefile

git: merge-one-file

completers/git_completer/cmd/merge_one_file_generated.go → completers/git_completer/cmd/mergeOneFile.go

@@ -5,15 +5,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var merge_one_fileCmd = &cobra.Command{
+var mergeOneFileCmd = &cobra.Command{
 	Use:     "merge-one-file",
 	Short:   "The standard helper program to use with git-merge-index",
 	Run:     func(cmd *cobra.Command, args []string) {},
 	GroupID: groups[group_low_level_helper].ID,
 }
 
 func init() {
-	carapace.Gen(merge_one_fileCmd).Standalone()
+	carapace.Gen(mergeOneFileCmd).Standalone()
 
-	rootCmd.AddCommand(merge_one_fileCmd)
+	rootCmd.AddCommand(mergeOneFileCmd)
 }