Bump4 to 0.21.0 diffs

all segfaults

     test/test_branch.py
     test/test_config.py
     test/test_credentials.py
     test/test_remote.py
     test/test_repository.py
git_merge_options ?