From 29b5ab554790bb57337a3b6ab9dcd963cf69d22e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 14:47:08 +0200 Subject: Adding upstream version 1.7.2+ds. Signed-off-by: Daniel Baumann --- tests/resources/merge-resolve/.gitted/refs/heads/trivial-13-branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/resources/merge-resolve/.gitted/refs/heads/trivial-13-branch (limited to 'tests/resources/merge-resolve/.gitted/refs/heads/trivial-13-branch') diff --git a/tests/resources/merge-resolve/.gitted/refs/heads/trivial-13-branch b/tests/resources/merge-resolve/.gitted/refs/heads/trivial-13-branch new file mode 100644 index 0000000..22e429a --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/refs/heads/trivial-13-branch @@ -0,0 +1 @@ +05f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c -- cgit v1.2.3