summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
AgeCommit message (Expand)Author
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar
2009-05-09mergetool--lib: specialize diff options for emerge and ecmergeDavid Aguilar
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar