diff options
| author | Kjetil Orbekk <kj@orbekk.com> | 2021-12-20 11:48:14 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kj@orbekk.com> | 2021-12-20 11:50:10 -0500 |
| commit | 74d0323c684352f01ea85a321c3b050545ef1e01 (patch) | |
| tree | 37645431b8473cc0e5e2012aa3cc758d626bcdf7 /common | |
| parent | 3393f17faefe508a651a6bb6e656c971d5afd39f (diff) | |
Use diff3 conflict style with git
Diffstat (limited to 'common')
| -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 |