History tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_ours