Miklos Vajna a écrit :
>
> This should respect diff.color:
Absolutely. And also color.ui. The following patch should do the trick:
diff --git a/builtin-merge.c b/builtin-merge.c
index 98adca5..cf557f7 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -7,6 +7,7 @@
*/
#include "cache.h"
+#include "color.h"
#include "parse-options.h"
#include "builtin.h"
#include "run-command.h"
@@ -712,6 +713,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
git_config(git_merge_config, NULL);
git_config(git_diff_ui_config, NULL);
+ if (diff_use_color_default == -1)
+ diff_use_color_default = git_use_color_default;
+
argc = parse_options(argc, argv, builtin_merge_options,
builtin_merge_usage, 0);
Olivier.
--
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
