NOTES_MERGE_RESOLVE_OURS 439 notes-merge.c case NOTES_MERGE_RESOLVE_OURS: NOTES_MERGE_RESOLVE_OURS 62 notes-utils.c *s = NOTES_MERGE_RESOLVE_OURS;