]> git.scottworley.com Git - auto-upgrade-with-pinch/commit
Use polite-merge for merging
authorScott Worley <scottworley@scottworley.com>
Fri, 29 May 2020 21:56:10 +0000 (14:56 -0700)
committerScott Worley <scottworley@scottworley.com>
Sat, 30 May 2020 06:12:55 +0000 (23:12 -0700)
commit5048e8ce3c5c7a54684ca806ea027dc552fea1eb
tree4c43729ecab5cd79942cdf4415ec32dcfdef2054
parent10f5329ab87c69585e2a9a821e524a6cc7218700
Use polite-merge for merging
modules/auto-upgrade.nix
overlays/polite-merge.nix [new file with mode: 0644]