git notes merge: Handle real, non-conflicting notes merges

diff --git a/fast-import.c b/fast-import.c
index 129a786832c2dc863e33ae2fc039a0212c1751d5..1e5d66ed0ab3b605de670758887b13f146bdd8a5 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -267,7 +267,7 @@ struct hash_list
 typedef enum {
        WHENSPEC_RAW = 1,
        WHENSPEC_RFC2822,
-       WHENSPEC_NOW,
+       WHENSPEC_NOW
 } whenspec_type;
 
 struct recent_command