aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
Commit message (Expand)AuthorAge
* Work around em-dash handling in newer AsciiDocJunio C Hamano2010-08-24
* mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-12
* difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-08