summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2010-11-09 22:49:53 +0100
committerJunio C Hamano <gitster@pobox.com>2010-11-17 13:22:49 -0800
commit443259cf929c0041310e3c77946252cbfc3f787d (patch)
tree120f8360fdd0f0c55c08fca1ecae571a2d167750 /notes-merge.h
parent6abb3655efe364cf0375b5cdae2729af7562ed45 (diff)
downloadgit-443259cf929c0041310e3c77946252cbfc3f787d.tar.gz
git notes merge: List conflicting notes in notes merge commit message
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 <avarab@gmail.com> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.h')
-rw-r--r--notes-merge.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.h b/notes-merge.h
index aa756931a5..195222f9da 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,