summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/trivial-13
blob: 297573a5766bfb70ab10890c194f3c2a843759ac (plain)
1
a3fabece9eb8748da810e1e08266fef9b7136ad4