diff options
Diffstat (limited to 'git/config')
-rw-r--r-- | git/config | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -94,7 +94,7 @@ conflictStyle = diff3 [push] - default = current + default = simple [repack] writebitmaps = true |
index : dotfiles | |
.config | Johannes Löthberg |
aboutsummaryrefslogtreecommitdiffstats |
-rw-r--r-- | git/config | 2 |
@@ -94,7 +94,7 @@ conflictStyle = diff3 [push] - default = current + default = simple [repack] writebitmaps = true |