aboutsummaryrefslogtreecommitdiff
path: root/dotfiles/.local/bin/diffconflicts
Commit message (Collapse)AuthorAge
* diffconflicts script for saner git merges in vimYaroslav de la Peña Smirnov2022-08-22