about summary refs log tree commit diff
path: root/home/alpha
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2022-03-18 06:55:47 +0900
committersefidel <contact@sefidel.net>2022-03-18 06:55:47 +0900
commit94f9caf21d40f079bcde46eab74e649c11dca76a (patch)
tree91c81e7ed3c50f7315817b9ccb7cc8b816e6ce07 /home/alpha
parentae06102731e2c7add93f02a4a93b2cbf57250ac7 (diff)
downloadnixrc-94f9caf21d40f079bcde46eab74e649c11dca76a.tar.gz
nixrc-94f9caf21d40f079bcde46eab74e649c11dca76a.zip
Revert "Revert "feat(home/development): use diff3 on conflict""
This reverts commit 0655c7c41c2081cf8056c1f65b257a7fedf9f6d4.
Diffstat (limited to 'home/alpha')
0 files changed, 0 insertions, 0 deletions