diff options
| -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> |