NOTES_MERGE_RESOLVE_THEIRS 445 notes-merge.c case NOTES_MERGE_RESOLVE_THEIRS: NOTES_MERGE_RESOLVE_THEIRS 64 notes-utils.c *s = NOTES_MERGE_RESOLVE_THEIRS;