summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/octo6
blob: 4c5a98ad9c5b6f2fff9875ae412a9f2f831ebde5 (plain)
1
b6f610aef53bd343e6c96227de874c66f00ee8e8