summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/octo4
blob: b0f9e42ef1419c545b3057b4dd37edaf89da88e0 (plain)
1
2
0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875010 -0500	branch: Created from HEAD
977c696519c5a3004c5f1d15d60c89dbeb8f235f 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae Edward Thomson <ethomson@edwardthomson.com> 1351875023 -0500	commit: octo4