summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/refs/heads/trivial-11
blob: 154de9a641f875550c1cd95d1bedb10b1cb52dce (plain)
1
3168dca1a561889b045a6441909f4c56145e666d