summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve.git/modules/submodule/refs/heads/master
blob: fe282569bc00140104ac9c19122f5cdc118aa29c (plain)
1
297aa6cd028b3336c7802c7a6f49143da4e1602d