b3-conflict-target.txt « tests - mirror-canary.git - Canary repo for the mirror pipeline Rollout 1a — App-token end-to-end test target. Safe to delete after Rollout 1a verification. (mirror of https://github.com/vyos/mirror-canary.git)

summary refs log tree commit diff

path: root/tests/b3-conflict-target.txt

blob: 1af145ad877ede4b8d62b04c0404b83fcb09fe55 (plain)

1	`B.7 rolling-version content — DIFFERENT from sagitta's b3-conflict-target — backport will conflict, AND ruleset blocks merge`