about summary refs log tree commit diff
path: root/colmena/cobalt
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2022-03-12 17:25:12 +0900
committersefidel <contact@sefidel.net>2022-03-12 17:25:16 +0900
commitfe8f9abb94c0606a4d8845be1982fa514b4ff73a (patch)
treea17b55b8a941037392c4954cd0b267262b097cc7 /colmena/cobalt
parent0e59c90d5eccd202cc0202da284b9a24b0e93a90 (diff)
downloadnixrc-fe8f9abb94c0606a4d8845be1982fa514b4ff73a.tar.gz
nixrc-fe8f9abb94c0606a4d8845be1982fa514b4ff73a.zip
feat(home/development): use diff3 on conflict
Diffstat (limited to 'colmena/cobalt')
0 files changed, 0 insertions, 0 deletions