diff options
| author | Vicent Martà <vicent@github.com> | 2013-01-17 16:56:57 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-01-17 16:56:57 -0800 |
| commit | ddcb28a41f3774e26fc6ae0a7174a5565e4749ce (patch) | |
| tree | a80eb78456d71dadeb13da82a53a31022b697f94 /tests-clar/checkout/tree.c | |
| parent | 3a93ab90658ea46fd2f581172b313a1de711ce65 (diff) | |
| parent | 25743bd7c5f14f2287d9c4fdf953c978e3b16916 (diff) | |
| download | libgit2-ddcb28a41f3774e26fc6ae0a7174a5565e4749ce.tar.gz | |
Merge pull request #1239 from ethomson/index_remove
add an index_remove_bypath that removes conflicts
Diffstat (limited to 'tests-clar/checkout/tree.c')
| -rw-r--r-- | tests-clar/checkout/tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests-clar/checkout/tree.c b/tests-clar/checkout/tree.c index b877b2eca..821cbfe0e 100644 --- a/tests-clar/checkout/tree.c +++ b/tests-clar/checkout/tree.c @@ -407,7 +407,7 @@ void assert_conflict( GIT_EMERGECONFLICT, git_checkout_tree(g_repo, g_object, &g_opts)); /* Stage the conflicting change */ - cl_git_pass(git_index_add_from_workdir(index, entry_path)); + cl_git_pass(git_index_add_bypath(index, entry_path)); cl_git_pass(git_index_write(index)); git_index_free(index); |