summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_ancestor
blob: 4092d428f1365ea8910a615dbb6d8f03a195b8b2 (plain)
1
2392a2dacc9efb562b8635d6579fb458751c7c5b