diff options
| author | ytti <saku@ytti.fi> | 2018-04-25 16:12:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-25 16:12:44 +0300 |
| commit | 583bc422448a234a215113a15f8a6976c50b2296 (patch) | |
| tree | b3f757e6f37aa058a0c80e4ded3ef82553bc98c1 /spec/githubrepo_spec.rb | |
| parent | 9a7d16c00163c421d2c9f3cb2783c76633860336 (diff) | |
| parent | dffae0f76656a57da8f5473ce21955638cbe1f7f (diff) | |
Merge pull request #1296 from wk/the-great-makeover
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'", |