notes_merge_options 669 builtin/notes.c static int merge_abort(struct notes_merge_options *o) notes_merge_options 687 builtin/notes.c static int merge_commit(struct notes_merge_options *o) notes_merge_options 759 builtin/notes.c struct notes_merge_options o; notes_merge_options 18 notes-merge.c void init_notes_merge_options(struct notes_merge_options *o) notes_merge_options 20 notes-merge.c memset(o, 0, sizeof(struct notes_merge_options)); notes_merge_options 115 notes-merge.c static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o, notes_merge_options 179 notes-merge.c static void diff_tree_local(struct notes_merge_options *o, notes_merge_options 262 notes-merge.c static void check_notes_merge_worktree(struct notes_merge_options *o) notes_merge_options 343 notes-merge.c static int ll_merge_in_worktree(struct notes_merge_options *o, notes_merge_options 370 notes-merge.c static int merge_one_change_manual(struct notes_merge_options *o, notes_merge_options 428 notes-merge.c static int merge_one_change(struct notes_merge_options *o, notes_merge_options 472 notes-merge.c static int merge_changes(struct notes_merge_options *o, notes_merge_options 508 notes-merge.c static int merge_from_diffs(struct notes_merge_options *o, notes_merge_options 535 notes-merge.c int notes_merge(struct notes_merge_options *o, notes_merge_options 661 notes-merge.c int notes_merge_commit(struct notes_merge_options *o, notes_merge_options 735 notes-merge.c int notes_merge_abort(struct notes_merge_options *o) notes_merge_options 22 notes-merge.h void init_notes_merge_options(struct notes_merge_options *o); notes_merge_options 53 notes-merge.h int notes_merge(struct notes_merge_options *o, notes_merge_options 68 notes-merge.h int notes_merge_commit(struct notes_merge_options *o, notes_merge_options 78 notes-merge.h int notes_merge_abort(struct notes_merge_options *o);