diff options
| author | Carlos Martín Nieto <[email protected]> | 2015-01-29 15:17:54 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2015-01-29 15:17:54 +0100 |
| commit | 2bcbe6bd2dc230539b8a909606107d65a706bd66 (patch) | |
| tree | ca2678a781eeab69e95b9c433e70472e4242b4be /merge.go | |
| parent | 2b17dffc07f5bc0c79ef4eff805ac3ab1cd4d004 (diff) | |
| parent | 92a1f92d912cdb5f68da8c1e5e3a4d1ebfd282db (diff) | |
Merge commit '92a1f92d912cdb5f68da8c1e5e3a4d1ebfd282db'
Diffstat (limited to 'merge.go')
| -rw-r--r-- | merge.go | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -145,6 +145,7 @@ func (r *Repository) Merge(theirHeads []*AnnotatedCommit, mergeOptions *MergeOpt cMergeOpts := mergeOptions.toC() cCheckoutOpts := checkoutOptions.toC() + defer freeCheckoutOpts(cCheckoutOpts) gmerge_head_array := make([]*C.git_annotated_commit, len(theirHeads)) for i := 0; i < len(theirHeads); i++ { |