diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:47:08 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:47:08 +0000 |
| commit | 29b5ab554790bb57337a3b6ab9dcd963cf69d22e (patch) | |
| tree | be1456d2bc6c1fb078695fad7bc8f6b212062d3c /tests/resources/twowaymerge.git/refs/heads | |
| parent | Initial commit. (diff) | |
| download | libgit2-29b5ab554790bb57337a3b6ab9dcd963cf69d22e.tar.xz libgit2-29b5ab554790bb57337a3b6ab9dcd963cf69d22e.zip | |
Adding upstream version 1.7.2+ds.upstream/1.7.2+ds
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/resources/twowaymerge.git/refs/heads')
| -rw-r--r-- | tests/resources/twowaymerge.git/refs/heads/first-branch | 1 | ||||
| -rw-r--r-- | tests/resources/twowaymerge.git/refs/heads/master | 1 | ||||
| -rw-r--r-- | tests/resources/twowaymerge.git/refs/heads/second-branch | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/tests/resources/twowaymerge.git/refs/heads/first-branch b/tests/resources/twowaymerge.git/refs/heads/first-branch new file mode 100644 index 0000000..ef0dead --- /dev/null +++ b/tests/resources/twowaymerge.git/refs/heads/first-branch @@ -0,0 +1 @@ +2224e191514cb4bd8c566d80dac22dfcb1e9bb83 diff --git a/tests/resources/twowaymerge.git/refs/heads/master b/tests/resources/twowaymerge.git/refs/heads/master new file mode 100644 index 0000000..ebf18f5 --- /dev/null +++ b/tests/resources/twowaymerge.git/refs/heads/master @@ -0,0 +1 @@ +1c30b88f5f3ee66d78df6520a7de9e89b890818b diff --git a/tests/resources/twowaymerge.git/refs/heads/second-branch b/tests/resources/twowaymerge.git/refs/heads/second-branch new file mode 100644 index 0000000..586a14a --- /dev/null +++ b/tests/resources/twowaymerge.git/refs/heads/second-branch @@ -0,0 +1 @@ +9b219343610c88a1187c996d0dc58330b55cee28 |