| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2024-03-14 | merge options: add a conflict style member | Phillip Wood | 1 | -1/+4 |
| 2024-03-14 | merge-ll: introduce LL_MERGE_OPTIONS_INIT | Phillip Wood | 1 | -0/+2 |
| 2023-06-21 | merge-ll: rename from ll-merge | Elijah Newren | 1 | -0/+109 |
 |
index : git.git | |
| The core git plumbing | Junio C. Hamano |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/merge-ll.h