summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
Diffstat (limited to 'init.el')
-rw-r--r--init.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/init.el b/init.el
index def97fc..11a319d 100644
--- a/init.el
+++ b/init.el
@@ -1046,7 +1046,7 @@
("l" . magit-wip-log-current)
("o" . magit-wip-log))
- (setq magit-wip-merge-branch t)
+ (setq magit-wip-merge-branch nil)
:config
(magit-wip-mode 1))