summaryrefslogtreecommitdiff
path: root/tests/resources/testrepo/.gitted/refs/heads/merge-conflict
blob: 3e24a24e06317336f3d0cff372a6ffa1443bfd3e (plain)
1
a38d028f71eaa590febb7d716b1ca32350cf70da