various doc fixes
- update can no longer be used to merge
- short summary start with lowercase
- add merge to short help list
- fix tests
adding dir/bar
adding foo
dir/bar
foo
adding dir/bar_2
adding foo_2
dir/bar_2
foo_2
adding a
adding c
adding b
adding d
removing a
removing c
recording removal of a as rename to b (100% similar)