diff options
| author | Wild Kat <wk@futureinquestion.net> | 2018-04-21 13:27:05 +0200 |
|---|---|---|
| committer | Wild Kat <wk@futureinquestion.net> | 2018-04-21 13:35:54 +0200 |
| commit | 21e3d6490496573f25ef77fe8172766ac7d1a736 (patch) | |
| tree | 785e5243f5f7ffe7e5a4bfcde551ec04c723b2ae /spec/githubrepo_spec.rb | |
| parent | 2648b1bb271727976e2d96123fcd51d52af39f79 (diff) | |
the great makeover - standardize layout, alignment, indentation
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'", |