summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/.gitted/refs/heads/trivial-2alt
blob: 474074120ca86e3311353c7306b2accedf72fd4e (plain)
1
566ab53c220a2eafc1212af1a024513230280ab9