Merge branch 'jc/maint-mergetool-read-fix'

diff --git a/environment.c b/environment.c
index 40185bc854ea2c5b8d2e3deb800dd6f3f44482a9..94d58fd24413ec1d1a5769029bd5149b609f0d4e 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -42,8 +42,8 @@ const char *editor_program;
 const char *askpass_program;
 const char *excludes_file;
 enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
-int read_replace_refs = 1;
-enum eol eol = EOL_UNSET;
+int read_replace_refs = 1; /* NEEDSWORK: rename to use_replace_refs */
+enum eol core_eol = EOL_UNSET;
 enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
 unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
 enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;