summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/master
blob: 8a329ae5f7c9b78c17126adcd4c1050e584527ee (plain)
1
bd593285fc7fe4ca18ccdbabf027f5d689101452