From d8de1b23e8ec896759424a2f146969783cdd89e3 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
Date: Tue, 22 Sep 2026 19:53:29 +0200
Subject: Add conflcit resultions strategies and interactive mode, and a lot of
 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <m@maandree.se>
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 0ec616b..4809db6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,7 @@
 *.gcov
 *.gcno
 *.gcda
+*.t
+*.to
 /git-rediff
+/testdir.*
-- 
cgit v1.3.1