diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-08-14 14:53:26 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-08-14 14:53:26 -0400 |
| commit | c18638a1ebc629092960729ad1d98e44dd562c94 (patch) | |
| tree | 0e5d1d48843d6872cb428b91a1dd6af54949d93d /.local | |
| parent | cf4d25f755161951d1ddefbbf50e715707608df8 (diff) | |
emacs: automatically use smerge-mode for git merge files
Diffstat (limited to '.local')
0 files changed, 0 insertions, 0 deletions