el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.

[profile] / Makefile

diff --git a/Makefile b/Makefile
index 033006a..09d911a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -151,10 +151,13 @@ SCRIPTLINKS               += update-buildable-branch
 ## Shells.
 DOTLINKS               += .profile .shell-rc .shell-logout
 DOTLINKS               += .shrc .rcrc
-DOTLINKS               += .zprofile .zshrc .zshenv
-DOTLINKS               += .bash_profile .bash_completion .bashrc .inputrc
+DOTLINKS               += .zprofile .zshrc .zlogout .zshenv
+DOTLINKS               += .bash_profile .bash_completion .bash_logout
+DOTLINKS               += .bashrc .inputrc
 .bash_profile_SRC       = bash-profile
 .bash_completion_SRC    = bash-completion
+.bash_logout_SRC        = shell-logout
+.zlogout_SRC            = shell-logout
 
 ## Git.
 DOTSUBST               += .gitconfig