Switch branchdiff aliases to functions. Add merging aliases.
Background the visual-branchdiff function.