summaryrefslogtreecommitdiff
path: root/tests/merge/workdir/renames.c
Commit message (Expand)AuthorAgeFilesLines
* str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstrEdward Thomson2021-10-171-1/+0
* fileops: rename to "futils.h" to match function signaturesPatrick Steinhardt2019-07-201-1/+1
* treewide: remove use of C++ style commentsPatrick Steinhardt2018-07-131-1/+1
* merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-251-3/+3
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-3/+3
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-11/+3
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-3/+3
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-13/+14
* Prevent user's merge.conflictstyle from breaking testsBen Straub2014-02-051-0/+7
* Rename tests-clar to testsBen Straub2013-11-141-0/+156