diff --git a/test/file.four b/test/file.four new file mode 100644 index 0000000..180b866 --- /dev/null +++ b/test/file.four @@ -0,0 +1 @@ +some nonconflicting message diff --git a/test/file.two b/test/file.two new file mode 100644 index 0000000..135cf15 --- /dev/null +++ b/test/file.two @@ -0,0 +1 @@ +feature file