summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/refs/heads/df_ancestor
blob: 4bc37ac606315a6b79e2053242d17970e36996f0 (plain)
1
2da538570bc1e5b2c3e855bf702f35248ad0735f