diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-02 12:55:50 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-02 13:15:07 +1100 |
| commit | 8901d11674b20b59102d24ad94a394dde0e0977b (patch) | |
| tree | 29a290398ce513b0be18666c61cdfc47672e6821 /pkg/commands/files.go | |
| parent | 8b7f7cbc30f2ded008ff2b123664dc493b7527b5 (diff) | |
fix merge conflict cat issue on windows
Diffstat (limited to 'pkg/commands/files.go')
| -rw-r--r-- | pkg/commands/files.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/commands/files.go b/pkg/commands/files.go index 3f6d1c377..0f82d1186 100644 --- a/pkg/commands/files.go +++ b/pkg/commands/files.go @@ -16,7 +16,7 @@ import ( // CatFile obtains the content of a file func (c *GitCommand) CatFile(fileName string) (string, error) { - return c.OSCommand.RunCommandWithOutput("%s %s", c.OSCommand.Platform.CatCmd, c.OSCommand.Quote(fileName)) + return c.OSCommand.CatFile(fileName) } // StageFile stages a file |