| Commit message (Expand) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | mergetool: Don't error out in the merge case where the local file is deleted | Theodore Ts'o | 2007-03-29 | |
| * | mergetool: Replace use of "echo -n" with printf(1) to be more portable | Theodore Ts'o | 2007-03-29 | |
| * | mergetool: print an appropriate warning if merge.tool is unknown | Theodore Ts'o | 2007-03-18 | |
| * | mergetool: Add support for vimdiff. | James Bowes | 2007-03-18 | |
| * | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o | 2007-03-13 | |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/git-mergetool.sh