summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/octo2
blob: f503977a733ca389f1c3c7c75293d1178169acd5 (plain)
1
158dc7bedb202f5b26502bf3574faa7f4238d56c