Base returns the best common ancestor of local and remote.

File combines the contents of two edited files into the original.

Tree combines the changes to trees a and b onto the base o.