summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/refs/heads/trivial-7-branch
blob: 1762bb5dbc3449826c2b6460c472e3d12e978c78 (plain)
1
5195a1b480f66691b667f10a9e41e70115a78351