From 8bd5a05913ba4520e986d3330a5e9ae1c2790e31 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Mon, 30 Mar 2020 10:13:26 +0100
Subject: [PATCH] git-mergetool: add page (#3947)

---
 pages/common/git-mergetool.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pages/common/git-mergetool.md

diff --git a/pages/common/git-mergetool.md b/pages/common/git-mergetool.md
new file mode 100644
index 000000000..a3386993a
--- /dev/null
+++ b/pages/common/git-mergetool.md
@@ -0,0 +1,28 @@
+# git mergetool
+
+> Run merge conflict resolution tools to resolve merge conflicts.
+> More information: <https://git-scm.com/docs/git-mergetool>.
+
+- Launch the default merge tool to resolve conflicts:
+
+`git mergetool`
+
+- List valid merge tools:
+
+`git mergetool --tool-help`
+
+- Launch the merge tool identified by a name:
+
+`git mergetool --tool {{tool_name}}`
+
+- Don't prompt before each invocation of the merge tool:
+
+`git mergetool --no-prompt`
+
+- Explicitly use the GUI merge tool (see the `merge.guitool` config variable):
+
+`git mergetool --gui`
+
+- Explicitly use the regular merge tool (see the `merge.tool` config variable):
+
+`git mergetool --no-gui`