From 51fa65a9a19f518c4b8578faafa5d81ee876f946 Mon Sep 17 00:00:00 2001
From: Flavia Bastos <FlaviaBastos@users.noreply.github.com>
Date: Thu, 18 Oct 2018 10:47:31 -0300
Subject: [PATCH] diff3: add page (#2437)

---
 pages/linux/diff3.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 pages/linux/diff3.md

diff --git a/pages/linux/diff3.md b/pages/linux/diff3.md
new file mode 100644
index 000000000..4f01f7d4f
--- /dev/null
+++ 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}}`