summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/octo1
blob: 0b6c9214a3da12096d75fe4c2a1ac941b2c463ef (plain)
1
2
0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874933 -0500	branch: Created from HEAD
977c696519c5a3004c5f1d15d60c89dbeb8f235f 16f825815cfd20a07a75c71554e82d8eede0b061 Edward Thomson <ethomson@edwardthomson.com> 1351874954 -0500	commit: octo1