Matt McCutchen schrieb: > @@ -963,6 +953,8 @@ man.<tool>.path:: > Override the path for the given tool that may be used to > display help in the 'man' format. See linkgit:git-help[1]. > > +include::merge-config.txt[] > + > merge.conflictstyle:: > Specify the style in which conflicted hunks are written out to > working tree files upon merge. The default is "merge", which Here, the list is not in alphabetic order anymore. BTW, your commit message should emphasize the use-cases where an alphabetic order is a real benefit. Otherwise, this is just code churn. -- Hannes -- 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
