summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/trivial-2alt
blob: a2a28d401213658508127c2475e6a160ece6fb40 (plain)
1
2
0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352091695 -0600	branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
c607fc30883e335def28cd686b51f6cfa02b06ec 566ab53c220a2eafc1212af1a024513230280ab9 Edward Thomson <ethomson@edwardthomson.com> 1352092452 -0600	commit: 2alt