various doc fixes
- update can no longer be used to merge
- short summary start with lowercase
- add merge to short help list
- fix tests
Is there an error message when trying to diff non-existing files?
found: No such file or directory
not: No such file or directory
Is there an error message when trying to add non-existing files?
found: No such file or directory
not: No such file or directory