summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
AgeCommit message (Expand)AuthorFilesLines
2010-08-24Work around em-dash handling in newer AsciiDocLibravatar Junio C Hamano1-4/+4
2009-04-12mergetool--lib: simplify API usage by removing more global variablesLibravatar David Aguilar1-9/+7
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libLibravatar David Aguilar1-0/+56