summaryrefslogtreecommitdiff
path: root/common/.gitconfig
AgeCommit message (Expand)Author
2021-12-20Use diff3 conflict style with gitKjetil Orbekk
2020-10-19emacs configsKjetil Orbekk