summaryrefslogtreecommitdiffstats
path: root/merge-ll.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge options: add a conflict style memberPhillip Wood2024-03-141-1/+3
* merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood2024-03-141-1/+1
* merge-ll: expose revision names to custom driversAntonin Delpeuch2024-01-241-3/+14
* config: use config_error_nonbool() instead of custom messagesJeff King2023-12-091-1/+1
* Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano2023-07-171-1/+0
|\
| * treewide: remove unnecessary includes for wrapper.hCalvin Wan2023-07-051-1/+0
* | Merge branch 'gc/config-context'Junio C Hamano2023-07-061-0/+1
* | Merge branch 'rs/strbuf-expand-step'Junio C Hamano2023-07-061-15/+18
|/
* Merge branch 'jc/abort-ll-merge-with-a-signal'Junio C Hamano2023-06-301-1/+8
* merge-ll: rename from ll-mergeElijah Newren2023-06-211-0/+432