Merging files using AppCode as a command line tool

Most often you need to merge three versions of the same file: your local version,
the version in the repository or in the upstream, and the base revision, which is the origin for the two
diverged versions.