diff options
Diffstat (limited to 'spec/githubrepo_spec.rb')
| -rw-r--r-- | spec/githubrepo_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/githubrepo_spec.rb b/spec/githubrepo_spec.rb index baa9a14..67c99f0 100644 --- a/spec/githubrepo_spec.rb +++ b/spec/githubrepo_spec.rb @@ -70,7 +70,7 @@ describe GithubRepo do repo_head.expects(:target).returns("our_target") merge_index.expects(:write_tree).with(repo).returns("tree") merge_index.expects(:conflicts?).returns(false) - Rugged::Commit.expects(:create).with(repo, + Rugged::Commit.expects(:create).with(repo, parents: ["our_target", "their_target"], tree: "tree", message: "Merge remote-tracking branch 'origin/master'", |