summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/trivial-10
blob: 5b378cd88d7ca11e75fd0c8367591b3322c7593e (plain)
1
0ec5f433959cd46177f745903353efb5be08d151