summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-07-31 00:05:03 -0400
committerKyle Meyer <kyle@kyleam.com>2015-07-31 00:05:03 -0400
commita12f7f01ea8e1ee92d1123164b93611091dbf085 (patch)
tree2d5ce6c458934962fd36fe74bc51e2829d1a15e5 /init.el
parent9e5e17027635bd66753d618829e9b8188583e021 (diff)
downloademacs.d-a12f7f01ea8e1ee92d1123164b93611091dbf085.tar.gz
Set smerge-diff-switches
Diffstat (limited to 'init.el')
0 files changed, 0 insertions, 0 deletions