summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
AgeCommit message (Expand)AuthorFilesLines
2009-11-23mergetool--lib: simplify guess_merge_tool()Libravatar René Scharfe1-7/+6
2009-05-24mergetool--lib: add support for araxis mergeLibravatar David Aguilar1-2/+23
2009-05-09mergetool--lib: specialize diff options for emerge and ecmergeLibravatar David Aguilar1-3/+3
2009-04-12mergetool--lib: simplify API usage by removing more global variablesLibravatar David Aguilar1-51/+58
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libLibravatar David Aguilar1-0/+378