summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/trivial-14
blob: 89051853ae9d75e0b8c7ee38fc9ef319694bd561 (plain)
1
7e2d058d5fedf8329db44db4fac610d6b1a89159