summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuriy Andamasov <yuriy@andamasov.com>2026-06-02 03:18:26 +0300
committerGitHub <noreply@github.com>2026-06-02 03:18:26 +0300
commitc39a26f8c106bc8d0898261ba700d19b6e119022 (patch)
treea9b651a9cdd9ec49cde9b212aa8b91d94ca2a69b
parent3b5b691ac6eacea414bee8a2a4c54e063ea85525 (diff)
parent27ac5bb530b444da2f01dca4343f9e631f6d2b03 (diff)
downloadipaddrcheck-c39a26f8c106bc8d0898261ba700d19b6e119022.tar.gz
ipaddrcheck-c39a26f8c106bc8d0898261ba700d19b6e119022.zip
Merge pull request #39 from vyos/test/mirror-drift-modify
test: mirror backport drift verification (2/2)
-rw-r--r--mirror-drift-canary.txt2
1 files changed, 1 insertions, 1 deletions
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)