summary refs log tree commit diff stats
path: root/hooks/pre-up/emacs
diff options
context:
space:
mode:
authorAlan Pearce2015-12-17 09:03:36 +0100
committerAlan Pearce2015-12-17 09:03:36 +0100
commit72303ddc158dc7aa26fe041e9be646bca857babd (patch)
tree8e67a22e4e358a811d76cf6191ec3fbe27ed7bad /hooks/pre-up/emacs
parenteac4c6007a802ba7d430283888aa3a03d4844751 (diff)
downloaddotfiles-72303ddc158dc7aa26fe041e9be646bca857babd.tar.lz
dotfiles-72303ddc158dc7aa26fe041e9be646bca857babd.tar.zst
dotfiles-72303ddc158dc7aa26fe041e9be646bca857babd.zip
Git: Remember merge conflict resolutions
Diffstat (limited to 'hooks/pre-up/emacs')
0 files changed, 0 insertions, 0 deletions