summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/octo2
blob: 5392a4f8652dde7a7a2d348bf4d3254a6529bd82 (plain)
1
2
0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874960 -0500	branch: Created from HEAD
977c696519c5a3004c5f1d15d60c89dbeb8f235f 158dc7bedb202f5b26502bf3574faa7f4238d56c Edward Thomson <ethomson@edwardthomson.com> 1351874974 -0500	commit: octo2