diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-11-11 15:20:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 15:20:50 -0500 |
| commit | ceddeed80a21f0d3a3396d90dd61fada361ed745 (patch) | |
| tree | 1b21dd455b3fbffcd4d5da52f5e8a58785510dd4 /tests/merge/workdir/simple.c | |
| parent | 9ab351c0d5330106b5562524cd303cbd5789a1d8 (diff) | |
| parent | 1a8b2922d953e78bd51fc6d5ef290e1f7e00af3a (diff) | |
| download | libgit2-ceddeed80a21f0d3a3396d90dd61fada361ed745.tar.gz | |
Merge pull request #6104 from libgit2/ethomson/path
path: refactor utility path functions
Diffstat (limited to 'tests/merge/workdir/simple.c')
| -rw-r--r-- | tests/merge/workdir/simple.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge/workdir/simple.c b/tests/merge/workdir/simple.c index 6c4cf7e3c..f51ff09a7 100644 --- a/tests/merge/workdir/simple.c +++ b/tests/merge/workdir/simple.c @@ -504,7 +504,7 @@ void test_merge_workdir_simple__checkout_ours(void) cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); - cl_assert(git_path_exists(TEST_REPO_PATH "/conflicting.txt")); + cl_assert(git_fs_path_exists(TEST_REPO_PATH "/conflicting.txt")); } void test_merge_workdir_simple__favor_ours(void) |