| Age | Commit message (Expand) | Author |
|---|---|---|
| 2007-03-29 | mergetool: Replace use of "echo -n" with printf(1) to be more portable | Theodore Ts'o |
| 2007-03-19 | mergetool: print an appropriate warning if merge.tool is unknown | Theodore Ts'o |
| 2007-03-19 | mergetool: Add support for vimdiff. | James Bowes |
| 2007-03-14 | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o |
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |
path: root/git-mergetool.sh