Merge branch 'mm/status-suggest-merge-abort'

diff --git a/convert.h b/convert.h
index ccf436bfbf2a89ceb7003ea6dbebf6ae2b6f4a8c..82871a11d5fb45133096b26ad46c6c0f65797926 100644 (file)
--- a/convert.h
+++ b/convert.h
@@ -7,7 +7,8 @@
 enum safe_crlf {
        SAFE_CRLF_FALSE = 0,
        SAFE_CRLF_FAIL = 1,
-       SAFE_CRLF_WARN = 2
+       SAFE_CRLF_WARN = 2,
+       SAFE_CRLF_RENORMALIZE = 3
 };
 
 extern enum safe_crlf safe_crlf;