diff options
author | Alan Pearce | 2015-12-17 09:03:36 +0100 |
---|---|---|
committer | Alan Pearce | 2015-12-17 09:03:36 +0100 |
commit | 72303ddc158dc7aa26fe041e9be646bca857babd (patch) | |
tree | 8e67a22e4e358a811d76cf6191ec3fbe27ed7bad /tag-zsh/config | |
parent | eac4c6007a802ba7d430283888aa3a03d4844751 (diff) | |
download | dotfiles-72303ddc158dc7aa26fe041e9be646bca857babd.tar.lz dotfiles-72303ddc158dc7aa26fe041e9be646bca857babd.tar.zst dotfiles-72303ddc158dc7aa26fe041e9be646bca857babd.zip |
Git: Remember merge conflict resolutions
Diffstat (limited to 'tag-zsh/config')
0 files changed, 0 insertions, 0 deletions