diff options
| author | Silvino Silva <silvino@bk.ru> | 2019-03-13 01:54:02 +0000 |
|---|---|---|
| committer | Silvino Silva <silvino@bk.ru> | 2019-03-13 01:54:02 +0000 |
| commit | 5b0c7a21c26f5ec3fcc227fda2b35cccaba93daa (patch) | |
| tree | f593cdc7fc50e50e2d2ea5fc976ffb404168c12f /dev/git | |
| parent | bc963c50f553bd25bd2fd17f10d2cf7ac5beecd5 (diff) | |
| download | doc-5b0c7a21c26f5ec3fcc227fda2b35cccaba93daa.tar.gz | |
dev git fix diff added conflictstyle
Diffstat (limited to 'dev/git')
| -rw-r--r-- | dev/git/index.html | 3 |
1 files changed, 2 insertions, 1 deletions
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> |