Flavia Bastos 6 anni fa
parent
commit
51fa65a9a1
1 ha cambiato i file con 11 aggiunte e 0 eliminazioni
  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}}`