summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/trivial-11-branch
blob: 2e411802928244b9fa67f48c425ab63df5a5d60a (plain)
1
6718a45909532d1fcf5600d0877f7fe7e78f0b86