arti/dotfiles
1
0
Fork 0
mirror of https://github.com/artizirk/dotfiles.git synced 2025-12-16 07:05:11 +02:00
Code Releases Wiki Activity

Change git diff conflict style

Browse Source
This commit is contained in:
Arti Zirk
2022-05-16 16:18:37 +03:00
parent e2fca2183e
commit 9bf942e661
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitconfig
View File

@@ -3,6 +3,7 @@
email = arti.zirk@gmail.com email = arti.zirk@gmail.com
[merge] [merge]
tool = meld tool = meld
conflictstyle = diff3
[alias] [alias]
plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches