Documentation: git diff --check detects conflict markers

diff --git a/environment.c b/environment.c
index a533aed630c20a5e0718bcea4375875a44896416..23a38e4b14f61f078bec3d7c2a5e5bcc5d505d9d 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -26,6 +26,7 @@ int warn_ambiguous_refs = 1;
 int warn_on_object_refname_ambiguity = 1;
 int ref_paranoia = -1;
 int repository_format_version;
+int repository_format_precious_objects;
 const char *git_commit_encoding;
 const char *git_log_output_encoding;
 int shared_repository = PERM_UMASK;