Sebastian Schuberth <sschuberth@xxxxxxxxx> writes: > Code Compare is a commercial file comparison tool for Windows, see > > http://www.devart.com/codecompare/ > > Version 2.80.4 added support for command line arguments preceded by a > dash instead of a slash. This is required for Git for Windows because > slashes in command line arguments get mangled with according to these > rules: > > http://www.mingw.org/wiki/Posix_path_conversion > > Signed-off-by: Sebastian Schuberth <sschuberth@xxxxxxxxx> > --- > Documentation/merge-config.txt | 8 ++++---- > contrib/completion/git-completion.bash | 2 +- > git-mergetool--lib.sh | 2 +- > mergetools/codecompare | 25 +++++++++++++++++++++++++ > 4 files changed, 31 insertions(+), 6 deletions(-) > create mode 100644 mergetools/codecompare > > diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt > index 861bd6f..e9e0d55 100644 > --- a/Documentation/merge-config.txt > +++ b/Documentation/merge-config.txt > @@ -54,10 +54,10 @@ merge.stat:: > 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. > + "bc3", "codecompare", "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. > > merge.verbosity:: > Controls the amount of output shown by the recursive merge I do not have a strong reason to vote for or against inclusion of yet another tool as mergetool backends (read: Meh), but what this patch does to Documentation/merge-config.txt is actively unwelcome. As we discussed earlier in http://thread.gmane.org/gmane.comp.version-control.git/201913/focus=201976 the longer term direction is to reduce the names of tools listed there. I am somewhat saddened to find your name in that thread; you should have been aware of that discussion when you wrote this patch. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html