From 443259cf929c0041310e3c77946252cbfc3f787d Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Tue, 9 Nov 2010 22:49:53 +0100 Subject: git notes merge: List conflicting notes in notes merge commit message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This brings notes merge in line with regular merge's behaviour. This patch has been improved by the following contributions: - Ævar Arnfjörð Bjarmason: Don't use C99 comments. Thanks-to: Ævar Arnfjörð Bjarmason Signed-off-by: Johan Herland Signed-off-by: Junio C Hamano --- notes-merge.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'notes-merge.h') diff --git a/notes-merge.h b/notes-merge.h index aa756931a..195222f9d 100644 --- a/notes-merge.h +++ b/notes-merge.h @@ -11,7 +11,7 @@ enum notes_merge_verbosity { struct notes_merge_options { const char *local_ref; const char *remote_ref; - const char *commit_msg; + struct strbuf commit_msg; int verbosity; enum { NOTES_MERGE_RESOLVE_MANUAL = 0, -- cgit v1.2.1