index 49a167f241f0832e62fb905390715e45ef5be3c4..5fb5007413666d0b3d0aaa4c553c1fd5a67e60d9 100644 (file)
- `pascal` suitable for source code in the Pascal/Delphi language.
- `pascal` suitable for source code in the Pascal/Delphi language.
+- `python` suitable for source code in the Python language.
+
- `ruby` suitable for source code in the Ruby language.
- `tex` suitable for source code for LaTeX documents.
- `ruby` suitable for source code in the Ruby language.
- `tex` suitable for source code for LaTeX documents.
+- `html` suitable for HTML/XHTML documents.
+
Performing a three-way merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Performing a three-way merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~