test.git
2015-11-19 Gary MacbookReverting file back to earlier version
2015-11-19 Gary Macbookuser 1 did something stupid, erased whole file!
2015-11-19 Gary MacbookOverriding the changes that user 1 made
2015-11-19 Gary Macbookuser2's changes
2015-11-19 Gary Macbookuser 1 did something not very nice, deleting all lines...
2015-11-18 Gary MacbookMerge branch 'master' of ssh://nsweb.tn.tudelft.nl...
2015-11-18 Gary Macbookedit line 3
2015-11-18 Gary Macbookedit line 1
2015-11-18 Gary MacbookMerge branch 'master' of ssh://nsweb.tn.tudelft.nl...
2015-11-18 Gary Macbooka conflict that should auto-solve
2015-11-18 Gary Macbooka conflict that should be auto fixable
2015-11-18 Gary MacbookMerge branch 'master' of ssh://nsweb.tn.tudelft.nl...
2015-11-18 Gary Macbookcommitting the changes by user 2 that make the conflict
2015-11-18 Gary Macbookfirst conflict test
2015-11-18 Gary Macbookadding more text
2015-11-18 Gary Macbookuser2 added some text
2015-11-18 Gary MacbookAdding first test file
2015-11-18 Gary Macbookremoving all files
2013-05-22 Steeletest
2013-05-22 Steelemore copy edits
2013-05-22 Steelefix conflict
2013-05-22 Steelefix merge
2013-05-22 Steeletest
2013-05-22 Steeleedit in trymerge
2013-05-22 Steeleedit in master
2013-05-22 Steeleedit trymerge
2013-05-22 SteeleReplaced code1 files with code2 files in the trymerge...
2013-05-22 Steeleinitial commit