diff options
Diffstat (limited to 'git')
| -rw-r--r-- | git/.gitconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index ea6c0eb..61ee177 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -16,3 +16,9 @@ [commit] gpgsign = true + +[merge] + conflictstyle = diff3 + +[credential] + helper = store |