Age | Commit message (Expand) | Author | Files | Lines |
2018-01-03 | merge: teach -Xours/-Xtheirs to symbolic link merge | Junio C Hamano | 1 | -0/+32 |
2012-09-08 | attr: "binary" attribute should choose built-in "binary" merge driver | Junio C Hamano | 1 | -1/+1 |
2012-09-08 | merge: teach -Xours/-Xtheirs to binary ll-merge driver | Junio C Hamano | 1 | -1/+13 |
2010-07-20 | Convert "! git" to "test_must_fail git" | Jared Hance | 1 | -1/+1 |
2010-01-17 | Teach git-pull to pass -X<option> to git-merge | Avery Pennarun | 1 | -0/+8 |
2010-01-17 | git merge -X<option> | Avery Pennarun | 1 | -0/+56 |