Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix minor formatting issue in man page for git-mergetool | Theodore Ts'o | 2007-03-29 | 1 | -5/+5 |
* | mergetool: Add support for vimdiff. | James Bowes | 2007-03-18 | 1 | -1/+1 |
* | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o | 2007-03-13 | 1 | -0/+46 |