diff options
| author | Vicent Marti <vicent@github.com> | 2014-07-02 15:29:14 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-07-02 15:29:14 +0200 |
| commit | 4df4ebd7c772a6dca577fd2968d7f81e72e4cff2 (patch) | |
| tree | 09b4546823927411eda7c097f383a94551c939f7 /tests | |
| parent | b0ca1b18e24723e50237dbe20de66bf39db38a2f (diff) | |
| parent | 967f5a76b1c89f1f93840407fd2afd1e8005dad6 (diff) | |
| download | libgit2-4df4ebd7c772a6dca577fd2968d7f81e72e4cff2.tar.gz | |
Merge pull request #2453 from ethomson/checkout_index
git_checkout_index: checkout other indexes
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/merge/workdir/dirty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge/workdir/dirty.c b/tests/merge/workdir/dirty.c index 776e4ea69..2f776853e 100644 --- a/tests/merge/workdir/dirty.c +++ b/tests/merge/workdir/dirty.c @@ -97,7 +97,7 @@ static int merge_branch(void) cl_git_pass(git_oid_fromstr(&their_oids[0], MERGE_BRANCH_OID)); cl_git_pass(git_merge_head_from_id(&their_heads[0], repo, &their_oids[0])); - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_ALLOW_CONFLICTS; + checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; error = git_merge(repo, (const git_merge_head **)their_heads, 1, &merge_opts, &checkout_opts); git_merge_head_free(their_heads[0]); |