Browse Source

diff3: add page (#2437)

Flavia Bastos 6 years ago
parent
commit
51fa65a9a1
1 changed files with 11 additions and 0 deletions
  1. 11 0
      pages/linux/diff3.md

+ 11 - 0
pages/linux/diff3.md

@@ -0,0 +1,11 @@
+# diff3
+
+> Compare three files line by line.
+
+- Compare files:
+
+`diff3 {{file1}} {{file2}} {{file3}}`
+
+- Show all changes, outlining conflicts:
+
+`diff3 --show-all {{file1}} {{file2}} {{file3}}`