parsing git merge-tree output.  zomg dont look at this