summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/refs/heads/trivial-4-branch
blob: bff519ef1840b291ddcdca18733915973f965e5a (plain)
1
183310e30fb1499af8c619108ffea4d300b5e778