index 5fb5007413666d0b3d0aaa4c553c1fd5a67e60d9..6f3551dc825a04628e7bcd133421093d89f01956 100644 (file)
- `bibtex` suitable for files with BibTeX coded references.
- `bibtex` suitable for files with BibTeX coded references.
-- `java` suitable for source code in the Java lanugage.
+- `html` suitable for HTML/XHTML documents.
+
+- `java` suitable for source code in the Java language.
- `pascal` suitable for source code in the Pascal/Delphi language.
- `pascal` suitable for source code in the Pascal/Delphi language.
+- `php` suitable for source code in the PHP 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.
- `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.
-- `html` suitable for HTML/XHTML documents.
-
Performing a three-way merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Performing a three-way merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~