diff options
Diffstat (limited to 'internal/git/localrepo/merge.go')
| -rw-r--r-- | internal/git/localrepo/merge.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/git/localrepo/merge.go b/internal/git/localrepo/merge.go index c721268ba..44bbae3ef 100644 --- a/internal/git/localrepo/merge.go +++ b/internal/git/localrepo/merge.go @@ -167,7 +167,7 @@ func parseMergeTreeError(objectHash git.ObjectHash, cfg mergeTreeConfig, output } fields := strings.Split(infoMsg, "\x00") - // The git output contains a null characted at the end, which creates a stray empty field. + // The git output contains a null character at the end, which creates a stray empty field. fields = fields[:len(fields)-1] for i := 0; i < len(fields); { |