diff --git a/_test_data/sandbox/conflict/shared.txt b/_test_data/sandbox/conflict/shared.txt new file mode 100644 index 0000000..fd9e33f --- /dev/null +++ b/_test_data/sandbox/conflict/shared.txt @@ -0,0 +1,4 @@ +conflict scenario +owner: sandbox-trunk-drift +resolution: trunk drift version +marker: e7e33dc