From f5971b13ab41c1131c796b509c06165e6e8fe6bf Mon Sep 17 00:00:00 2001 From: Silvino Silva Date: Sun, 2 Jun 2019 19:07:17 +0000 Subject: core and skel revision --- tools/conf/etc/skel/.gitconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'tools/conf/etc/skel/.gitconfig') 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 -- cgit 1.4.1-2-gfad0