updates
1 files changed, 1 insertions(+), 1 deletions(-) M .gitconfig
M .gitconfig => .gitconfig +1 -1
@@ 28,7 28,7 @@ autosetupmerge = always [merge] - conflictstyle = diff3 + conflictstyle = zdiff3 [push] default = current