Fancy git prompt
Default to simple merge in advance of git updates to merge semantics.