merge_abort       736 builtin/notes.c 	ret = merge_abort(o);
merge_abort       803 builtin/notes.c 		return merge_abort(&o);