blob: cb49d9cfe4aa6c820cce9183b6f6bc23acc3fbf0 [file] [log] [blame]
test:root:1
+- test:a:1
| \- test:b:1
| \- test:c:1 # conflict group c will completely vanish from resolved tree
\- test:b:2