diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:42:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:42:16 -0800 |
| commit | 39ca1bd88256ea482305b7e0acc943ef14e4b36d (patch) | |
| tree | 263d715e9f62be9995ecba9979c26ae10523ef41 /Documentation/merge-config.txt | |
| parent | eeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e (diff) | |
| parent | f35ec546008e8390e0fd8e545680e72fae0efa35 (diff) | |
| download | git-39ca1bd88256ea482305b7e0acc943ef14e4b36d.tar.gz git-39ca1bd88256ea482305b7e0acc943ef14e4b36d.tar.xz | |
Merge branch 'da/mergetool-docs'
Build on top of the clean-up done by jk/mergetool and automatically
generate the list of mergetool and difftool backends the build
supports to be included in the documentation.
* da/mergetool-docs:
doc: generate a list of valid merge tools
mergetool--lib: list user configured tools in '--tool-help'
mergetool--lib: add functions for finding available tools
mergetool--lib: improve the help text in guess_merge_tool()
mergetool--lib: simplify command expressions
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 897329bbd..d78d6d854 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -52,12 +52,12 @@ merge.stat:: at the end of the merge. True by default. merge.tool:: - Controls which merge resolution program is used by - linkgit:git-mergetool[1]. Valid built-in values are: "araxis", - "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", - "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" - and "xxdiff". Any other value is treated is custom merge tool - and there must be a corresponding mergetool.<tool>.cmd option. + Controls which merge tool is used by linkgit:git-mergetool[1]. + The list below shows the valid built-in values. + Any other value is treated as a custom merge tool and requires + that a corresponding mergetool.<tool>.cmd variable is defined. + +include::mergetools-merge.txt[] merge.verbosity:: Controls the amount of output shown by the recursive merge |