Merge branch 'js/range-diff-wo-dotdot'

[thirdparty/git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 1cff730715394fa5874c12323bba653ffe5b8abe..eb00b273e668e2725447a2d6a0edc5ad2d67ed67 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -14,6 +14,7 @@
 #include "lockfile.h"
 #include "run-command.h"
 #include "diff.h"
+#include "diff-merges.h"
 #include "refs.h"
 #include "refspec.h"
 #include "commit.h"
@@ -409,7 +410,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
        printf(_("Squash commit -- not updating HEAD\n"));
 
        repo_init_revisions(the_repository, &rev, NULL);
-       rev.ignore_merges = 1;
+       diff_merges_suppress(&rev);
        rev.commit_format = CMIT_FMT_MEDIUM;
 
        commit->object.flags |= UNINTERESTING;