add commit option to JGit.merge
no need for no-revision case, default behavior
fix bug/typo, setCommit not setSquash, ha!
some fluff for revision ranges, clean up merge
fix index error in assert - common problem, need to check others & make more tests
add options to parseMerge
add strategy, message & commit to parseMerge
use less space for filenames
add message for conflicting unmerged paths
list strategies, single commit, how to abort, links to merge tools
add TODO tasks, add CONFLICTING merge status

* add check for CONFLICTING, and save *.BASE, *.LOCAL, *.REMOTE & *.orig for merge
* reverse meld and p4m so meld is first, add note about save files, how to
* resolve merge.
add generated merge message to commit if repo state says merging resolved
add git pull to jgit.m
add pull and push