git-merge documentation: describe how conflict is presented

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index c61a58d8f2e57eb8a193feb8e408e0bee278c918..db16b0ca5b8146361a379de894a1394e0950fd38 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -310,6 +310,8 @@ configuration file (you still need to enable this with the
 attribute mechanism, via `.gitattributes`).  The following built in
 patterns are available:
 
+- `bibtex` suitable for files with BibTeX coded references.
+
 - `java` suitable for source code in the Java lanugage.
 
 - `pascal` suitable for source code in the Pascal/Delphi language.