Release 1.1.0
This release includes:
-
Don't be so picky about which branches can be merged together.
-
Avoid storing the name of the default imerge in the Git configuration when it is unambiguous. This is mostly nice because Git leaves section headers behind when configuration sections are deleted, so using
git-imerge
used to make the config file untidy. -
Abstract out the interface to Git. This is only an internal refactoring, but will hopefully make it easier to add tests and/or implement some functionality using libgit2 rather than the Git command line.
-
Various bug minor fixes.