diff options
| author | Yuriy Andamasov <yuriy@vyos.io> | 2026-06-02 03:17:06 +0300 |
|---|---|---|
| committer | Yuriy Andamasov <yuriy@vyos.io> | 2026-06-02 03:17:06 +0300 |
| commit | 27ac5bb530b444da2f01dca4343f9e631f6d2b03 (patch) | |
| tree | a9b651a9cdd9ec49cde9b212aa8b91d94ca2a69b | |
| parent | 3b5b691ac6eacea414bee8a2a4c54e063ea85525 (diff) | |
| download | ipaddrcheck-27ac5bb530b444da2f01dca4343f9e631f6d2b03.tar.gz ipaddrcheck-27ac5bb530b444da2f01dca4343f9e631f6d2b03.zip | |
test: modify canary file to trigger backport drift conflict (2/2)
| -rw-r--r-- | mirror-drift-canary.txt | 2 |
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) |