diff options
Diffstat (limited to 'tools/conf/etc/skel/.gitconfig')
| -rw-r--r-- | tools/conf/etc/skel/.gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/conf/etc/skel/.gitconfig b/tools/conf/etc/skel/.gitconfig index 3af5f03..730d8d9 100644 --- a/tools/conf/etc/skel/.gitconfig +++ b/tools/conf/etc/skel/.gitconfig @@ -5,5 +5,6 @@ tool = vimdiff [merge] tool = vimdiff + conflictstyle = diff3 [difftool] prompt = false |