various doc fixes
- update can no longer be used to merge
- short summary start with lowercase
- add merge to short help list
- fix tests
abort: edit failed: false exited with status 1transaction abort!rollback completedabort: edit failed: false exited with status 1transaction abort!rollback completed