From 27ac5bb530b444da2f01dca4343f9e631f6d2b03 Mon Sep 17 00:00:00 2001 From: Yuriy Andamasov Date: Tue, 2 Jun 2026 03:17:06 +0300 Subject: test: modify canary file to trigger backport drift conflict (2/2) --- mirror-drift-canary.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mirror-drift-canary.txt b/mirror-drift-canary.txt index 72e2508..8d09e16 100644 --- a/mirror-drift-canary.txt +++ b/mirror-drift-canary.txt @@ -1 +1 @@ -mirror backport drift canary — initial content +mirror backport drift canary - modified content (triggers cherry-pick conflict) -- cgit v1.2.3