diff options
| author | Jesse Ezell <[email protected]> | 2014-03-26 12:17:23 -0700 |
|---|---|---|
| committer | Jesse Ezell <[email protected]> | 2014-03-26 12:17:23 -0700 |
| commit | eff3a8b4d04349a5462f54c31d6f39213cecef71 (patch) | |
| tree | 81c2a3744ac3426d7480f0bc8ccb30ad41a3f614 /merge.go | |
| parent | 50a3c4aa0935adb798bc4ecf6612710908d227cf (diff) | |
support nil merge options
Diffstat (limited to 'merge.go')
| -rw-r--r-- | merge.go | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -146,7 +146,7 @@ func (r *Repository) Merge(theirHeads []*MergeHead, mergeOptions *MergeOptions, return nil } -func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options MergeOptions) (*Index, error) { +func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options *MergeOptions) (*Index, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() @@ -162,7 +162,7 @@ func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options MergeOpt return idx, nil } -func (r *Repository) MergeTrees(ancestor *Tree, ours *Tree, theirs *Tree, options MergeOptions) (*Index, error) { +func (r *Repository) MergeTrees(ancestor *Tree, ours *Tree, theirs *Tree, options *MergeOptions) (*Index, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() |
