| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | mergetool: print an appropriate warning if merge.tool is unknown | Theodore Ts'o | 2007-03-18 | 1 | -4/+9 |
| * | mergetool: Add support for vimdiff. | James Bowes | 2007-03-18 | 1 | -3/+5 |
| * | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o | 2007-03-13 | 1 | -0/+352 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/git-mergetool.sh