summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/refs/heads/trivial-6-branch
blob: efc4c55ac41b58e6aa9ceb30881e873a5c3c3f02 (plain)
1
a43150a738849c59376cf30bb2a68348a83c8f48