commit f9a249fc6c525b2e4ebc2166a0d9d54b5dedb3ed
author Max Haslbeck <haslbeck@google.com> Mon Mar 10 16:05:30 2025 +0000
committer Max Haslbeck <haslbeck@google.com> Mon Mar 10 16:05:30 2025 +0000
tree e37bc6680395166f83a68762752d107843244a18
parent 286e77cd7569cc219d83833739c4b0774f2cd64c

Change all files in stable to force a merge conflict

Change-Id: Id6d445c603e54202845510f9cbd6cb00290bcad4

a.txt

diff --git a/a.txt b/a.txt
index c25bd37..82a689b 100644
--- a/a.txt
+++ b/a.txt
@@ -1 +1 @@
-AAA some other content diff
+changing text for a merge conflict

b.txt

diff --git a/b.txt b/b.txt
index 2ef267e..fe696a1 100644
--- a/b.txt
+++ b/b.txt
@@ -1 +1 @@
-some content
+changeing test for a merge conflict

c.txt

diff --git a/c.txt b/c.txt
index b680eed..a075f5c 100644
--- a/c.txt
+++ b/c.txt
@@ -1 +1 @@
-test content 5
+losing the ability to write

d.txt

diff --git a/d.txt b/d.txt
index 75db990..77e612d 100644
--- a/d.txt
+++ b/d.txt
@@ -1 +1 @@
-content 4
+Bogus text, bitte ignorieren

e.txt

diff --git a/e.txt b/e.txt
index 8dc57bc..d523a15 100644
--- a/e.txt
+++ b/e.txt
@@ -1 +1 @@
-content 6
+Change conteing for a merge conflict