Add branching and merging commands.
Merge branch 'diff'