aboutsummaryrefslogtreecommitdiff
path: root/lisp/Makefile
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2019-11-10 22:04:27 +0100
committerJonas Bernoulli <jonas@bernoul.li>2019-11-10 22:04:27 +0100
commit3ca1b627717857b9154fc82f182e3c444b292e56 (patch)
tree00b0959ba56ea770560d47f12870e673707a5f9f /lisp/Makefile
parenta2168f9ed92d90888f43cd9e88ff9d46673120dd (diff)
magit-merge: Add --Xdiff-algorithm
Closes #3998.
Diffstat (limited to 'lisp/Makefile')
-rw-r--r--lisp/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/Makefile b/lisp/Makefile
index 95d6414..6138bab 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -41,7 +41,7 @@ magit-refs.elc: magit.elc
magit-files.elc: magit.elc
magit-reset.elc: magit.elc
magit-branch.elc: magit.elc magit-reset.elc
-magit-merge.elc: magit.elc
+magit-merge.elc: magit.elc magit-diff.elc
magit-tag.elc: magit.elc
magit-worktree.elc: magit.elc
magit-notes.elc: magit.elc