diff options
| author | David Morgan <djm_uk@protonmail.com> | 2024-10-25 12:51:24 +0100 |
|---|---|---|
| committer | David Morgan <djm_uk@protonmail.com> | 2024-10-25 12:51:24 +0100 |
| commit | 29bb0340b7e1205657423d5a85d8b612298a3152 (patch) | |
| tree | 8348908cc4d5858dc5f7e17ebd939e29644062da /.emacs.d/.gitignore | |
| parent | 301f3d263181bf39ee1770c87508340bcfb1fbe5 (diff) | |
| download | dotfiles-29bb0340b7e1205657423d5a85d8b612298a3152.tar.gz | |
Try diff3 conflict style again
Diffstat (limited to '.emacs.d/.gitignore')
0 files changed, 0 insertions, 0 deletions