| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 1 | -1/+1 |
| * | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-01-20 | 1 | -0/+2 |
| |\ | |||||
| | * | rerere: honor conflict-marker-size attribute | Junio C Hamano | 2010-01-17 | 1 | -0/+2 |
| * | | git merge -X<option> | Avery Pennarun | 2010-01-17 | 1 | -1/+1 |
| |/ | |||||
| * | merge-recursive: split low-level merge functions out. | Junio C Hamano | 2008-02-18 | 1 | -0/+15 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/ll-merge.h