diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2013-01-12 13:47:56 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-01-12 13:47:56 -0600 |
| commit | 25743bd7c5f14f2287d9c4fdf953c978e3b16916 (patch) | |
| tree | 7390d1d2d5d52f549329853903f381e58c1b1de6 /tests-clar/checkout/tree.c | |
| parent | e2d2c6e57d122f381fb42b7df1c7a12819050490 (diff) | |
| download | libgit2-25743bd7c5f14f2287d9c4fdf953c978e3b16916.tar.gz | |
add an index_remove_bypath that removes conflicts, renamed add_from_workdir to match
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 80e26a15a..176dcceb9 100644 --- a/tests-clar/checkout/tree.c +++ b/tests-clar/checkout/tree.c @@ -406,7 +406,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)); cl_assert_equal_i( |