Changes to the CLI version of the timeline command to show places where
forks occur in the tree and where content is merged.  Lots more work is
needed to show the structure of a tree well.  This is definitely a work
in progress.