Siklos/libgit2dart
1
0
Fork 0
mirror of https://github.com/SkinnyMind/libgit2dart.git synced 2025-05-05 12:49:08 -04:00
Code Issues Projects Releases Wiki Activity

test: improve coverage

Browse source
This commit is contained in:
Aleksey Kulikov 2021-10-15 17:37:38 +03:00
parent d75acbfdd3
commit d6eae1e9ed
71 changed files with 710 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/src/bindings/merge.dart
View file

@ -120,16 +120,16 @@ void merge({
String mergeFileFromIndex({
required Pointer<git_repository> repoPointer,
required Pointer<git_index_entry>? ancestorPointer,
required Pointer<git_index_entry>? oursPointer,
required Pointer<git_index_entry>? theirsPointer,
required Pointer<git_index_entry> oursPointer,
required Pointer<git_index_entry> theirsPointer,
}) {
final out = calloc<git_merge_file_result>();
final error = libgit2.git_merge_file_from_index(
out,
repoPointer,
ancestorPointer ?? nullptr,
oursPointer ?? nullptr,
theirsPointer ?? nullptr,
oursPointer,
theirsPointer,
nullptr,
);