summaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge-tree.txt (unfollow)
Commit message (Expand)AuthorFilesLines
2008-10-26userdiff: require explicitly allowing textconvJeff King7-27/+17
2008-10-26refactor userdiff textconv codeJeff King2-16/+38