summaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index aec45aa..a962927 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -328,6 +328,9 @@
'(window-divider-mode t)
'(winner-mode t))
+(if (eq system-type 'windows-nt)
+ (setq diff-command "C:/Program Files/Git/usr/bin/diff.exe"))
+
(setq ring-bell-function
(lambda ()
(let ((orig-fg (face-foreground 'mode-line)))