cmd_merge_ours 88 builtin.h extern int cmd_merge_ours(int argc, const char **argv, const char *prefix); cmd_merge_ours 431 git.c { "merge-ours", cmd_merge_ours, RUN_SETUP },