diff options
Diffstat (limited to 'cmd/gitaly-git2go')
| -rw-r--r-- | cmd/gitaly-git2go/merge_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gitaly-git2go/merge_test.go b/cmd/gitaly-git2go/merge_test.go index 1488ff59e..b0bf0c955 100644 --- a/cmd/gitaly-git2go/merge_test.go +++ b/cmd/gitaly-git2go/merge_test.go @@ -5,7 +5,7 @@ package main import ( "bytes" "os/exec" - "path" + "path/filepath" "strings" "testing" "time" @@ -40,7 +40,7 @@ func merge(t *testing.T, opts mergeSubcommand) (string, string, error) { args = append(args, arg, value) } - binary := path.Join(config.Config.BinDir, "gitaly-git2go") + binary := filepath.Join(config.Config.BinDir, "gitaly-git2go") ctx, cancel := testhelper.Context() defer cancel() |