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-4 | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/resources/merge-resolve/.gitted/refs/heads/trivial-4 (limited to 'tests/resources/merge-resolve/.gitted/refs/heads/trivial-4') diff --git a/tests/resources/merge-resolve/.gitted/refs/heads/trivial-4 b/tests/resources/merge-resolve/.gitted/refs/heads/trivial-4 new file mode 100644 index 0000000..f49bbf9 --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/refs/heads/trivial-4 @@ -0,0 +1 @@ +cc3e3009134cb88014129fc8858d1101359e5e2f -- cgit v1.2.3