summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_ours
blob: a1c50dce8d751dd005fc730092f1216dc76e19c9 (plain)
1
34bfafff88eaf118402b44e6f3e2dbbf1a582b05