Add todo to throw if merging where appropriate
Add merge.readIsMergeInProgress()
Add isSymbolicRef()
Replace readHeadContent w readSymbolicRefContent
Use commit() to commit merge, rather than using custom code