fix bad merge (LastError -> MakeGitError)
wrap merge functions
merge options / merge tree options