summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/refs/heads/trivial-14-branch
blob: 0158f950c3a4e0890a29098707fae3015e07b8c8 (plain)
1
8187117062b750eed4f93fd7e899f17b52ce554d