swayrice/dotfiles/.local/bin/diffconflicts, branch swayfx

swayrice/dotfiles/.local/bin/diffconflicts, branch swayfx Personal Ganoo + Loonix config/dotfiles for the Sway WM/compositor. https://git.yaroslavps.com/configs/swayrice/atom?h=swayfx 2022-08-22T03:46:27Z diffconflicts script for saner git merges in vim 2022-08-22T03:46:27Z Yaroslav de la Peña Smirnov yps@yaroslavps.com 2022-08-22T03:46:27Z urn:sha1:cdb34dc6279b0227f407e042770ffed70a2a51c4