Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge_files: some simplification

Browse Source
This commit is contained in:
Edward Thomson
2026-05-02 08:23:37 +01:00
parent 8d4d980b10
commit 643b7e1038
3 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/libgit2/merge/files.c
View File

@@ -234,7 +234,7 @@ void test_merge_files__automerge_from_index_delete_file(void)
void test_merge_files__automerge_from_index_add_file(void)
{
git_merge_file_result result = {0};
git_index_entry *ancestor=NULL, ours, *theirs=NULL;
git_index_entry *ancestor = NULL, ours, *theirs = NULL;
git_oid_from_string(&ours.id, "d427e0b2e138501a3d15cc376077a3631e15bd46", GIT_OID_SHA1);
ours.path = "automergeable.txt";