summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
AgeCommit message (Expand)Author
2010-08-24Work around em-dash handling in newer AsciiDocJunio C Hamano
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