Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | object_type: use new enumeration namesethomson/index_fixes | Edward Thomson | 2018-12-01 | 1 | -1/+1 |
* | treewide: remove use of C++ style comments | Patrick Steinhardt | 2018-07-13 | 1 | -1/+1 |
* | merge tests: move expected data into own file | Edward Thomson | 2015-11-25 | 1 | -1/+2 |
* | Update git_merge_tree_opts to git_merge_options | Edward Thomson | 2014-03-20 | 1 | -4/+4 |
* | Introduce git_merge_file for consumers | Edward Thomson | 2014-03-20 | 1 | -22/+0 |
* | index: rename an entry's id to 'id' | Carlos MartÃn Nieto | 2014-01-25 | 1 | -1/+1 |
* | merge_file should use more aggressive levels | Edward Thomson | 2014-01-20 | 1 | -2/+2 |
* | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 1 | -0/+217 |