Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not attempt to check out submodule as blob when merging a submodule modify... | David Turner | 2017-12-04 | 2 | -0/+2 |
* | merge_trees: introduce test for submodule renames | Edward Thomson | 2017-02-09 | 14 | -0/+5 |
* | Merge submodules | Edward Thomson | 2014-01-20 | 24 | -0/+6 |
* | Don't try to merge binary files | Edward Thomson | 2014-01-20 | 9 | -0/+3 |
* | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 309 | -0/+110 |