projects
/
~madcoder
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
update mutt
[~madcoder/dotfiles.git]
/
gitconfig
diff --git
a/gitconfig
b/gitconfig
index
f19f617
..
7f66089
100644
(file)
--- a/
gitconfig
+++ b/
gitconfig
@@
-52,6
+52,7
@@
untracked = bold yellow
[merge]
verbosity = 1
+ conflictstyle = diff3
[clean]
requireForce = false
[pack]