| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-08-26 | merge-recursive --patience | Justin Frankel | 1 | -0/+1 |
| 2010-08-26 | ll-merge: replace flag argument with options struct | Jonathan Nieder | 1 | -15/+6 |
| 2010-08-06 | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 1 | -0/+1 |
| 2010-08-06 | ll-merge: make flag easier to populate | Jonathan Nieder | 1 | -0/+14 |
| 2010-03-20 | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 1 | -1/+1 |
| 2010-01-20 | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 1 | -0/+2 |
| 2010-01-17 | git merge -X<option> | Avery Pennarun | 1 | -1/+1 |
| 2010-01-17 | rerere: honor conflict-marker-size attribute | Junio C Hamano | 1 | -0/+2 |
| 2008-02-18 | merge-recursive: split low-level merge functions out. | Junio C Hamano | 1 | -0/+15 |
 |
index : kernel/git/mst/git.git | |
| Unnamed repository; edit this file 'description' to name the repository. | Michael S. Tsirkin |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/ll-merge.h