lab2 1.5 changes to MergeConflict.txt from clone/second repository
lab2 1.5 finishing merge
lab2 1.5 merge updated txt.orig and txt~.orig files
lab2 testing pre-commit hook