go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-25 22:32:13 +02:00
Code Issues Releases Activity

support multiple modes of git pull

Browse Source
This commit is contained in:
Jesse Duffield
2020-08-11 21:18:38 +10:00
parent 1c0da2967c
commit fcd5aea04e
7 changed files with 92 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git_test.go
View File

@@ -703,7 +703,7 @@ func TestGitCommandMerge(t *testing.T) {
return exec.Command("echo")
}
assert.NoError(t, gitCmd.Merge("test"))
assert.NoError(t, gitCmd.Merge("test", MergeOpts{}))
}
// TestGitCommandUsingGpg is a function.