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/added-in-master.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/resources/merge-resolve/added-in-master.txt (limited to 'tests/resources/merge-resolve/added-in-master.txt') diff --git a/tests/resources/merge-resolve/added-in-master.txt b/tests/resources/merge-resolve/added-in-master.txt new file mode 100644 index 0000000..233c091 --- /dev/null +++ b/tests/resources/merge-resolve/added-in-master.txt @@ -0,0 +1 @@ +this file is added in master -- cgit v1.2.3