test: add conflict resolver smoke fixtures

This commit is contained in:

Valdemar Lorenzen

2026-10-14 16:17:07 +02:00

parent a3aef713e2

commit f2d505b952

3 changed files with 36 additions and 0 deletions

Symlink

View File

				`@@ -0,0 +1 @@`
				`greeting.txt`