Age | Commit message (Expand) | Author |
---|---|---|
2014-03-20 | Add `git_merge_status` to provide info about an upcoming merge | Edward Thomson |
2014-01-21 | Merge submodules | Edward Thomson |
2014-01-21 | Don't try to merge binary files | Edward Thomson |
2013-11-15 | Rename tests-clar to tests | Ben Straub |