NOTES_MERGE_RESOLVE_MANUAL 437 notes-merge.c case NOTES_MERGE_RESOLVE_MANUAL: NOTES_MERGE_RESOLVE_MANUAL 60 notes-utils.c *s = NOTES_MERGE_RESOLVE_MANUAL;