diff options
Diffstat (limited to 'git/gitconfig')
| -rw-r--r-- | git/gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git/gitconfig b/git/gitconfig index 92ca318..7037c8f 100644 --- a/git/gitconfig +++ b/git/gitconfig | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | navigate = true | 16 | navigate = true |
| 17 | side-by-side = true | 17 | side-by-side = true |
| 18 | line-numbers = true | 18 | line-numbers = true |
| 19 | tabs = 4 | ||
| 19 | 20 | ||
| 20 | [merge] | 21 | [merge] |
| 21 | conflictstyle = diff3 | 22 | conflictstyle = diff3 |
