diff --git a/gitconfig b/gitconfig index 36c0e23..6bac153 100644 --- a/gitconfig +++ b/gitconfig @@ -17,10 +17,6 @@ changes = diff --name-status -r diffstat = diff --stat -r lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative -[merge] - tool = bc3 -[mergetool] - cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED [push] default = current [giggle]