commit 0d53b1b7a52d2be86b906de952f08cd14ae5cfd5
Merge: bc9a650 2bf5436 3821dc9
Author: a <a@b>
Date:   Mon Sep 7 12:53:55 2026 +0000

    Merge branches 'b1' and 'b2'

diff --cc x.txt
index 01e79c3,01e79c3,01e79c3..8b04714
--- a/x.txt
+++ b/x.txt
@@@@ -1,3 -1,3 -1,3 +1,3 @@@@
   1
---2
+++EVIL
   3
