summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
Commit message (Expand)AuthorAgeFilesLines
* Work around em-dash handling in newer AsciiDocJunio C Hamano2010-08-241-4/+4
* mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-121-9/+7
* difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-081-0/+56