Merge branch 'np/pack'

diff --git a/diff.c b/diff.c
index f7355191dde978c057ca0c56fc1aa98db4ebcc02..439d4746cae343f08b298473d35d9792048abfa0 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2220,7 +2220,6 @@ void diff_setup(struct diff_options *options)
        options->rename_limit = -1;
        options->dirstat_percent = 3;
        options->context = 3;
-       options->msg_sep = "";
 
        options->change = diff_change;
        options->add_remove = diff_addremove;