summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/refs/heads/rename_conflict_theirs
blob: 130989399e20b40323aac5411088dd20e5ea66ec (plain)
1
a802e06f1782a9645b9851bc7202cee74a8a4972