summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
Commit message (Expand)AuthorAgeFilesLines
* mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon2009-10-281-2/+15
* mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-241-2/+23
* mergetool--lib: specialize diff options for emerge and ecmergeDavid Aguilar2009-05-091-3/+3
* mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-121-51/+58
* difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-081-0/+378