summaryrefslogtreecommitdiff
path: root/Documentation/mergetools
ModeNameSize
-rw-r--r--vimdiff.txt6946logplain