Home » Mailing list archives » git » 2008 » June » 27

Re: [PATCH 12/13] Build in merge

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Olivier Marin
Subject: Re: [PATCH 12/13] Build in merge
Date: Friday, June 27, 2008 - 4:03 am

Miklos Vajna a écrit :

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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
Re: [PATCH] Introduce filter_independent() in commit.c, Junio C Hamano, (Sat Jun 21, 2:45 am)
[PATCH 00/13] Build in merge, Miklos Vajna, (Sat Jun 21, 10:00 am)
[PATCH 09/13] Add new test to ensure git-merge handles mor ..., Miklos Vajna, (Sat Jun 21, 10:00 am)
[PATCH 10/13] Introduce get_merge_bases_many(), Miklos Vajna, (Sat Jun 21, 10:00 am)
[PATCH 11/13] Introduce reduce_heads(), Miklos Vajna, (Sat Jun 21, 10:00 am)
[PATCH 12/13] Build in merge, Miklos Vajna, (Sat Jun 21, 10:00 am)
Re: [PATCH 12/13] Build in merge, Olivier Marin, (Wed Jun 25, 9:22 am)
Re: [PATCH 12/13] Build in merge, Miklos Vajna, (Thu Jun 26, 6:06 pm)
Re: [PATCH 12/13] Build in merge, Olivier Marin, (Fri Jun 27, 4:03 am)
Re: [PATCH 12/13] Build in merge, Johannes Schindelin, (Fri Jun 27, 4:56 am)
Re: [PATCH 12/13] Build in merge, Miklos Vajna, (Fri Jun 27, 5:54 am)
Re: [PATCH 12/13] Build in merge, Miklos Vajna, (Fri Jun 27, 6:01 am)
Re: [PATCH 12/13] Build in merge, Olivier Marin, (Fri Jun 27, 6:04 am)
Re: [PATCH 12/13] Build in merge, Miklos Vajna, (Fri Jun 27, 6:17 am)