aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
Commit message (Expand)AuthorAge
* mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon2009-10-28
* mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-24
* difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-07
* difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-07