diff options
| -rw-r--r-- | common/.gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/.gitconfig b/common/.gitconfig index fbccce4..2bb8fe5 100644 --- a/common/.gitconfig +++ b/common/.gitconfig @@ -15,3 +15,5 @@ smtpserverport = 587 [pull] rebase = true +[merge] + conflictStyle = diff3 |