merge-recursive --renormalize

diff --git a/cache.h b/cache.h
index ed73da883ffdfd031c799355a27eb6bf2d73cae3..aa725b0d3168e93001a96979fd8e29c6c7910f3a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -551,7 +551,6 @@ extern int read_replace_refs;
 extern int fsync_object_files;
 extern int core_preload_index;
 extern int core_apply_sparse_checkout;
-extern int merge_renormalize;
 
 enum safe_crlf {
        SAFE_CRLF_FALSE = 0,