# HG changeset patch # User zegervdv # Date 1632041682 -7200 # Node ID 0b2c942eb2c9eef1f8f57490325f1a2eade8ec6f # Parent 06e6e2dde6cb551f7a5af653ddd822e79ea1ed85 Ignore merge leftovers diff -r 06e6e2dde6cb -r 0b2c942eb2c9 .chezmoiignore --- a/.chezmoiignore Thu Sep 16 18:51:17 2021 +0200 +++ b/.chezmoiignore Sun Sep 19 10:54:42 2021 +0200 @@ -1,5 +1,6 @@ README.md *.orig +**/.orig *.rej stylua.toml scripts diff -r 06e6e2dde6cb -r 0b2c942eb2c9 .gitignore --- a/.gitignore Thu Sep 16 18:51:17 2021 +0200 +++ b/.gitignore Sun Sep 19 10:54:42 2021 +0200 @@ -1,1 +1,2 @@ *~ +**/*.orig