diff options
Diffstat (limited to 'test/conflict.repo')
| -rw-r--r-- | test/conflict.repo | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/test/conflict.repo b/test/conflict.repo new file mode 100644 index 0000000..a95658c --- /dev/null +++ b/test/conflict.repo @@ -0,0 +1,19 @@ +C:Q1EyN5AdpAOBJWKMR89pp/C66o+OE= +P:a +V:1 +S:1 +I:1 +D:!b<2 + +C:Q1C4uoV7SdMdDhYg4OCVmI71D8HIA= +P:b +V:1 +S:1 +I:1 + +C:Q1hdUpqRv5mYgJEqW52UmVsvmyysE= +P:b +V:2 +S:1 +I:1 + |