summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/octo1
blob: 4d2c669023ea28c13b5e926e564e3dc9f2404e53 (plain)
1
16f825815cfd20a07a75c71554e82d8eede0b061