From 5b0c7a21c26f5ec3fcc227fda2b35cccaba93daa Mon Sep 17 00:00:00 2001
From: Silvino Silva <silvino@bk.ru>
Date: Wed, 13 Mar 2019 01:54:02 +0000
Subject: dev git fix diff added conflictstyle

---
 dev/git/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dev/git')

diff --git a/dev/git/index.html b/dev/git/index.html
index ed64efa..b2feb83 100644
--- a/dev/git/index.html
+++ b/dev/git/index.html
@@ -35,6 +35,7 @@
     $ git config --global diff.tool vimdiff
     $ git config --global merge.tool vimdiff
     $ git config --global difftool.prompt false
+    $ git config --global merge.conflictstyle diff3
     </pre>
 
     <h2 id="teamwork">1. Team WorkFlow</h2>
@@ -329,7 +330,7 @@
     <p>Same using diff command;</p>
 
     <pre>
-    $ diff orig file > file.patch
+    $ diff -u orig file > file.patch
     </pre>
 
     <h3 id="remote">2.3. Working with remotes</h3>
-- 
cgit 1.4.1-2-gfad0