diff3: add page (#2437)

2018-10-18 10:47:31 -03:00
parent f49d0f7965
commit 51fa65a9a1
1 changed files with 11 additions and 0 deletions
--- a/pages/linux/diff3.md
+++ b/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}}`