Age | Commit message (Expand) | Author |
---|---|---|
2012-09-09 | attr: "binary" attribute should choose built-in "binary" merge driver | Junio C Hamano |
2012-09-09 | merge: teach -Xours/-Xtheirs to binary ll-merge driver | Junio C Hamano |
2010-07-21 | Convert "! git" to "test_must_fail git" | Jared Hance |
2010-01-18 | Teach git-pull to pass -X<option> to git-merge | Avery Pennarun |
2010-01-18 | git merge -X<option> | Avery Pennarun |