rerere: recalculate conflict ID when unresolved conflict is committed

diff --git a/config.c b/config.c
index a0a6ae1980d9c95d13bb78422e64850396c1a4d8..f4a208a16607c2f3eb10c02d067808d46399b7a3 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1233,7 +1233,7 @@ static int git_default_core_config(const char *var, const char *value)
                }
                eol_rndtrp_die = git_config_bool(var, value);
                global_conv_flags_eol = eol_rndtrp_die ?
-                       CONV_EOL_RNDTRP_DIE : CONV_EOL_RNDTRP_WARN;
+                       CONV_EOL_RNDTRP_DIE : 0;
                return 0;
        }