diff options
| author | joseferminj <[email protected]> | 2015-01-22 00:44:51 -0500 |
|---|---|---|
| committer | Carlos MartÃn Nieto <[email protected]> | 2015-01-29 15:17:46 +0100 |
| commit | 92a1f92d912cdb5f68da8c1e5e3a4d1ebfd282db (patch) | |
| tree | ed333eda917e3c7976e427479c04ccbcf6d90777 /merge.go | |
| parent | a9d993f3d1400970bfba572747edbee1b57fd221 (diff) | |
Add TargetDirectory field to Checkout options.
TargetDirectory field indicates a alternative checkout path to workdir.
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++ { |
