Add `merge` command

[marstr]

Adding a command baronial merge {RefSpec} should allow for users to reconcile differences between two transactions, and create a merge transaction.

Depends on marstr/envelopes#5