summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/ff_branch
blob: e9e90512f9d0e779e1c1b4ab4cd072ea46d8090d (plain)
1
fd89f8cffb663ac89095a0f9764902e93ceaca6a