summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6
blob: fb685bb631c24c984d82ee249b4bacd943e9491e (plain)
1
99b4f7e4f24470fa06b980bc21f1095c2a9425c0