projects
/
emacs-init.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
mywin: use whitespace-line-column to calculate number of parallel windows
[emacs-init.git]
/
setup
/
smerge.el
1
(defun sm-try-smerge ()
2
(save-excursion
3
(goto-char (point-min))
4
(when (re-search-forward "^<<<<<<< " nil t)
5
(smerge-mode 1))))
6
7
(add-hook 'find-file-hook 'sm-try-smerge t)
8
(add-hook 'after-revert-hook 'sm-try-smerge t)