Ade Attwood a94a9d6dc2 feat(bin): support merge-patch --skip ... When hitting a conflict with no changes you can `--skip` just like you would if you where rebaseing and running `rebase --skip`		2022-02-15 20:31:59 +00:00
..
files	feat(bin): support merge-patch --skip	2022-02-15 20:31:59 +00:00
lib	refactor(core): start to make dotfiles public	2020-09-20 06:22:17 +01:00
manifests	refactor(emacs): update folder structure to move melpa out of the repo	2021-11-21 19:11:44 +00:00
templates	feat(git): move to delta diff for diff in the terminal	2021-11-21 10:52:35 +00:00