druckdev/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
b0688da69e753ff743990f61d26192fe94debcaa
dotfiles/.config/git/config
Julian Prein d30b102e42 git: Set merge.conflictstyle to diff3 
Display original text in addition to changes from both sides.
2024-09-21 00:03:34 +02:00

2.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink