summaryrefslogtreecommitdiff
path: root/tests/merge/workdir/analysis.c
Commit message (Expand)AuthorAgeFilesLines
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-4/+5
* Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCEEdward Thomson2014-05-271-18/+18
* Move GIT_MERGE_CONFIG_* to its own enumEdward Thomson2014-05-271-31/+38
* Introduce GIT_MERGE_CONFIG_* for merge.ff settingsEdward Thomson2014-05-271-0/+26
* UNBORN implies FAST_FORWARDEdward Thomson2014-03-201-1/+2
* Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-201-4/+20
* git_merge_status -> git_merge_analysisEdward Thomson2014-03-201-0/+90