about summary refs log tree commit diff
path: root/third_party/git/Documentation/config/mergetool.txt
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/Documentation/config/mergetool.txt')
-rw-r--r--third_party/git/Documentation/config/mergetool.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/third_party/git/Documentation/config/mergetool.txt b/third_party/git/Documentation/config/mergetool.txt
index 09ed31dbfa9c..16a27443a3ed 100644
--- a/third_party/git/Documentation/config/mergetool.txt
+++ b/third_party/git/Documentation/config/mergetool.txt
@@ -30,6 +30,16 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and wait for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable