Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge-recursive --patience | Justin Frankel | 2010-08-26 | 1 | -0/+1 |
* | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 | 1 | -15/+6 |
* | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+1 |
* | ll-merge: make flag easier to populate | Jonathan Nieder | 2010-08-06 | 1 | -0/+14 |
* | 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 |