Includes under the hood improvements around determining the set of local changes to be carried to include changes that were previously missed in a number of scenarios. Also adds a deterministic ordering for changes uploaded for review before an import was done and landed after the merge, which would previously appear first instead of last because of how git would normally walk the tree. Finally adds a new option to allow users to ask git-upstream finish the import in the case of a conflict was encountered.
Many improvements around the tests to make it easier to add tests, and get better information returned in the even of a test failure which should help make future development easier.