diff options
| author | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-26 23:01:56 +0300 |
|---|---|---|
| committer | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-26 23:01:56 +0300 |
| commit | 79aa03fdaebba19c01912969ec463e37a674aa5d (patch) | |
| tree | ffa6aa6fe13cc84cdd569220c282a3bb0323323a | |
| parent | 042bd038807ad638272893fe5a4d4d9ff191e5bb (diff) | |
| download | mirror-canary-79aa03fdaebba19c01912969ec463e37a674aa5d.tar.gz mirror-canary-79aa03fdaebba19c01912969ec463e37a674aa5d.zip | |
test: B.3 backport conflict — same file path, conflicting content vs sagitta
| -rw-r--r-- | tests/b3-conflict-target.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/b3-conflict-target.txt b/tests/b3-conflict-target.txt new file mode 100644 index 0000000..a12bfae --- /dev/null +++ b/tests/b3-conflict-target.txt @@ -0,0 +1 @@ +rolling-version content — DIFFERENT from sagitta — backport will conflict |