| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | merge-recursive --patience | Justin Frankel | 2010-08-26 |
| * | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 |
| * | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 |
| * | ll-merge: make flag easier to populate | Jonathan Nieder | 2010-08-06 |
| * | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 |
| * | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-01-20 |
| |\ | |||
| | * | rerere: honor conflict-marker-size attribute | Junio C Hamano | 2010-01-17 |
| * | | git merge -X<option> | Avery Pennarun | 2010-01-17 |
| |/ | |||
| * | merge-recursive: split low-level merge functions out. | Junio C Hamano | 2008-02-18 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/ll-merge.h