diff options
| author | Silvino Silva <silvino@bk.ru> | 2019-06-02 19:07:17 +0000 |
|---|---|---|
| committer | Silvino Silva <silvino@bk.ru> | 2019-06-02 19:07:17 +0000 |
| commit | f5971b13ab41c1131c796b509c06165e6e8fe6bf (patch) | |
| tree | fe063fe68ae187d0dac111abd75fbd374f27c736 /tools/conf/etc/skel/.gitconfig | |
| parent | 9d9bfe21eef76ca690f864f7757b1470d07d1301 (diff) | |
| download | doc-f5971b13ab41c1131c796b509c06165e6e8fe6bf.tar.gz | |
core and skel revision
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 |