die_resolve_conflict   26 advice.h       extern void NORETURN die_resolve_conflict(const char *me);
die_resolve_conflict  318 builtin/commit.c 		die_resolve_conflict("commit");
die_resolve_conflict 1216 builtin/merge.c 		die_resolve_conflict("merge");
die_resolve_conflict  818 builtin/pull.c 		die_resolve_conflict("Pull");