Account for third window width in merge diff
tree998efe1045e4a899101fe73c35d5b75374c54518
-rw-r--r-- 10 .gitignore
-rw-r--r-- 1145 CONTRIBUTING.markdown
-rw-r--r-- 4849 README.markdown
drwxr-xr-x - doc
drwxr-xr-x - plugin