From a25950a527277c35f702cf6af64db0ee0806530d Mon Sep 17 00:00:00 2001 From: trunk bot Date: Wed, 17 Apr 2024 05:15:51 +0000 Subject: [PATCH] Moving words egremoigne, fistulate --- bazel/echo/echo.txt | 2 +- bazel/foxtrot/foxtrot.txt | 2 +- logical-conflict.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 logical-conflict.txt diff --git a/bazel/echo/echo.txt b/bazel/echo/echo.txt index fcee9d9ac87c1..37451b1c2730f 100644 --- a/bazel/echo/echo.txt +++ b/bazel/echo/echo.txt @@ -45,6 +45,7 @@ ecphonesis eardropper eardrum eardrums +egremoigne eisell eared earflap @@ -1664,7 +1665,6 @@ egre egregious egregiously egregiousness -egremoigne enamor egress egressed diff --git a/bazel/foxtrot/foxtrot.txt b/bazel/foxtrot/foxtrot.txt index 6a5bb55b5b2c6..96c69ca934c3b 100644 --- a/bazel/foxtrot/foxtrot.txt +++ b/bazel/foxtrot/foxtrot.txt @@ -4538,7 +4538,6 @@ fistulae fistulana fistular fistularia -fistulate fistulated fistulatome fistule @@ -9958,6 +9957,7 @@ fricandeaux fricandel fricandelle fricando +fistulate fricassee fricasseed fricasseeing diff --git a/logical-conflict.txt b/logical-conflict.txt new file mode 100644 index 0000000000000..413acb3b12312 --- /dev/null +++ b/logical-conflict.txt @@ -0,0 +1 @@ +simulate logical merge conflict \ No newline at end of file